summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2021-04-29SL-14113 Cleanup typo and cross referencePtolemy
2021-04-29SL-14113 Fix moon hazePtolemy
2021-04-29DRTVWR-528 merge up to 6.4.19Dave Houlton
2021-04-01Merge branch 'master' into DV528-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-29SL-14895, restore previous post-deferred alpha behaviorDave Houlton
2021-03-18DRTVWR-528, delete all unreferenced shader files, improve dev QoLDave Houlton
2021-03-17DRTVWR-525 housekeeping: delete unused shader fileDave Houlton
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-528Dave Houlton
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey 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' v6.4.15 into DRTVWR-528Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
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-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-01-29SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside ↵Ptolemy
outside of the bound fbo in forward render class2 cloud shader
2021-01-29SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma ↵Ptolemy
space for accurate color reproduction of sun textures
2021-01-27SL-13490 fix debug normals under non-uniform scaleDave Houlton
2021-01-22SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are unusually ↵Ptolemy
dim in EEP
2021-01-19SL-13629, reconstruct rainbow lookup coord to reduce interior bandingDave Houlton
2021-01-13SL-13629 Modify texcoord to reverse rainbow color orderDave Houlton
2021-01-07SL-14035 revert incorrect removal of glarePtolemy
2021-01-06SL-14035: Incorporate patch from Sovereign Engineer to fix specular reflectionPtolemy
2020-11-26SL-14399 Enqueue into 'LLViewerAssetStorage::assetRequestCoro' failedAndrey Kleshchev
2020-11-11Revert "SL-13565, clean up now-orphaned throttling variable and handling code"Andrey Kleshchev
This reverts commit 6c1a15d936763dc14f368e10bd53c6e351bf0136.
2020-10-29fix for SL-14227 The 'Fatal error detected' message is displayed while ↵Callum Prentice
downloading a new version of the SL Viewer
2020-10-27Fix for meta issue: SL-14211 Determine optimum cache size for VFS ↵Callum Prentice
replacement cache
2020-10-26SL-14148 remove redundant zeroing of the fileMnikolenko Productengine
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14DRTVWR-510 merge master 6.4.11Dave Houlton
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-07Tweak name of cache folder in the Viewer cache directoryCallum Prentice
2020-10-07remove the static cache files from the viewer and update viewer_manifest.py ↵Callum Prentice
to not try to copy them into the installer bundle
2020-10-07This changeset hooks up many things that have been in progress and moves ↵Callum Prentice
things about between llfilesystem and lldiskcache - there is still some bookkeeping work left but this is the first version that appears to work and actively manage the cache
2020-10-06Add in the C++ filesystem based cache and clean up some indempotent ↵Callum Prentice
functions in llfilesystem
2020-09-29Merge branch 'master' 6.4.10 into DRTVWR-510Dave Houlton
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-22Merge branch 'master' 6.4.9 into DRTVWR-510Dave Houlton
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton