diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-09-04 12:51:24 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-09-04 12:51:24 -0700 |
| commit | 49abe2c8bc23e306d304d02704e2b883648baea6 (patch) | |
| tree | bb07d3fce7de85e22c4f59abff2ea65d031fcd69 /indra/newview/llappviewer.cpp | |
| parent | c2724537adab9d31c23d33e36002772a9c56f4c3 (diff) | |
| parent | d5446b3bcd34ad63b1d120f34c2a4d234262fd38 (diff) | |
Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into develop
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index afa701c5f2..4eb4f5ae20 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp |