summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-06-26DRTVWR-476: On Windows, request 64-bit compilerNat Goodspeed
to avoid TeamCity build failures due to 32-bit compiler running out of virtual memory for precompiled headers.
2020-06-25DRTVWR-476, SL-13512: Make suspendUntilTimeout() notice shutdown.Nat Goodspeed
Specifically, the shutdown crash reported in SL-13512 was due to LLExperienceCache::idleCoro() looping on suspendUntilTimeout(), failing to notice in its slumbers that the viewer was shutting down around it. Make suspendUntilTimeout() internally call suspendUntilEventOnWithTimeout(), which already listens for "LLApp" state-change events and throws Stopping when LLApp enters its shutdown sequence.
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-06-23Merge branch 'master' 6.4.5 into DRTVWR-510Dave Houlton
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-06-23Increment viewer version to 6.4.5Nat Goodspeed
following promotion of DRTVWR-512
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-22SL-13416 eliminate sun/moon specular on shadowed surfacesDave Houlton
2020-06-19DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.Nat Goodspeed
There are duplicate LLTrace::BlockTimerStatHandle key strings declared in llsettingsdaycycle.cpp and llsettingswater.cpp -- the only instances of duplicate BlockTimerStatHandle keys in the viewer code base. SL-13467 tracks intentional crashes due to duplicate LLInstanceTracker subclass instances with one of those keys. The simplest experiment to try to eliminate those crashes is to ensure that every BlockTimerStatHandle in the code base is unique.
2020-06-19Merge branch 'master' 6.4.4 into DRTVWR-510Dave Houlton
2020-06-18SL-9632 Fix HUD objects to not use environment lightingPtolemy
2020-06-18SL-9632: Fix most HUD objects incorrectly being effected by the environment ↵Ptolemy
lighting
2020-06-18SL-13481 Fixed mouselook teleport not having up to date dataAndrey Kleshchev
2020-06-18SL-13163 revert 2 more instances of 'new EEP' specular calculationDave Houlton
2020-06-17SL-13469 Fixed use of wrong clear functionAndrey Kleshchev
2020-06-16SL-13449, fix link errors for class1 soften shadersDave Houlton
2020-06-17SL-13418 Restored original default value for DoubleClickTeleportAndrey Kleshchev
2020-06-17SL-12085 Debug log for show() and PeekMessageAndrey Kleshchev
User's viewer freezes right after setStartupState( STATE_LOGIN_CLEANUP ) and these places are primary suspects
2020-06-16SL-13418 Move and view panel now applies changes on the goAndrey Kleshchev
2020-06-15SL-13418 Restored previously removed 'click on land' controls from 'move & view'Andrey Kleshchev
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-15SL-12085 Debug-log window positionAndrey Kleshchev
2020-06-15SL-13418 Added converter from old mouse binding settings to new onesAndrey Kleshchev
2020-06-12SL-13421 Separated some sitting-exclusive controlsAndrey Kleshchev
2020-06-12SL-13421 Removed camera control keybindings from mouselookAndrey Kleshchev
2020-06-11SL-13390 Disable Havok icon when Havok is not includedAndrey Kleshchev
2020-06-11SL-13438 Fixed descriptionAndrey Kleshchev
2020-06-10SL-13412 Disabled the (default) click to walk in mouselook modeAndrey Lihatskiy
2020-06-08SL-13821 shader clean up and formatDave Houlton
2020-06-08SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-06-05SL-13084: Add references to other common filesPtolemy
2020-06-05SL-13084: Move texture coords section to top in class2/windlight/cloudsV to ↵Ptolemy
match class1/deffered/cloudsV
2020-06-05SL-13084: Fix inverted cloud scroll with ALM is offPtolemy
2020-06-05SL-13804: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
2020-06-05SL-13084: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
2020-06-05SL-13390 Fix Openal BuildsAndrey Kleshchev
2020-06-03More post-merge cleanupAndrey Lihatskiy
2020-06-03Post-merge buildfixAndrey Lihatskiy
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-06-02Increment viewer version to 6.4.4Nat Goodspeed
following promotion of DRTVWR-508
2020-05-29edit-me-to-trigger-new-build.txt edited online with BitbucketDave Houlton
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-28SL-12607 Bar color to blueAndrey Kleshchev
2020-05-28SL-13340 Restored status display for loginAndrey Kleshchev
2020-05-28SL-12665 Readjusted all logosAndrey Kleshchev
2020-05-28SL-12664 readjusted logo #2Andrey Kleshchev
2020-05-28SL-12664 readjusted logoAndrey Kleshchev