summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
AgeCommit message (Collapse)Author
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-12BUG-230673: Trim asset disk cache regularlyAnsariel
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml
2021-04-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-18SL-14927 Some avatar names not resolvingAndrey Kleshchev
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-12SL-14961 Bugsplat loggingAndrey Kleshchev
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-01-15SL-14283 Don't crash viewer, only show a notificationAndrey Kleshchev
2020-11-17SL-14342 FIXED Crash: "Uninitialized param singleton LLVoiceClient"Mnikolenko Productengine
2020-11-11Revert "SL-13565, clean up now-orphaned throttling variable and handling code"Andrey Kleshchev
This reverts commit 6c1a15d936763dc14f368e10bd53c6e351bf0136.
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-12SL-14078 No point in verifying display name cap each frame #2Andrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-20SL-13565, clean up now-orphaned throttling variable and handling codeDave Houlton
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-07SL-12486 Better data deletionandreykproductengine
2019-05-08Merge viewer-releaseGraham Linden
2019-01-15SL-10291 Replace apr_atomic with standard C++11 functionalityandreykproductengine
2018-06-13Mods to hook up water settings to water normals for rendering with support ↵Graham Linden
for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-01-30MAINT-8180 Add the way to get default string despite of current localiztionmaxim_productengine
2018-01-17Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-16MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper ↵AndreyL ProductEngine
call stacks
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-08-25MAINT-7739 Make LLOSInfo a Singletonandreykproductengine
2017-08-10MAINT-7596 FIXED System information is truncated in JIRA issues filed ↵Mnikolenko Productengine
through "Report bug" viewer option
2017-06-27MAINT-7554 Frame throttlingandreykproductengine
2017-10-06MAINT-1013 Changing YieldTime should show effects immediatelyandreykproductengine
2016-12-22MAINT-7024 Release notes page was requested prior to proxy initialization.andreykproductengine
2017-03-16mergecoyot@coyot-sager-PC
2017-03-16pull from viewer64 gatecoyot@coyot-sager-PC
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-01SL-321: fix merge removal of mIsFirstRun definition, remove pyinstaller from ↵Glenn Glazer
viewer cmake, now in VMP package cmake
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 05:25:28 +0000