summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-533Callum Prentice
2021-04-29DRTVWR-528 merge up to 6.4.19Dave Houlton
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-28After a small but successful test at our standup, we're going to make the ↵Callum Prentice
default value for the VAD sensitivity 0 (off). The settings can all still be changed via Debug variables but this seems like a sensible starting point for the next test.
2021-04-21SL-15072 update. Values for VAD settings now stored in debug settings. ↵Callum Prentice
Request successfully sent at startup and also, whenever a relevant debug setting is changed. Going to send this build to Brett to test
2021-04-21SL-15028 Update GuidebookURL settingMnikolenko Productengine
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-17SL-14906 More adjustments to guidebookAndrey Kleshchev
The Guidebook should remember it's open/closed state between sessions. The Guidebook button should show as pressed while the Guidebook is open.
2021-04-06SL-14960 Add checkbox to turn off collision sound.Mnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DV528-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/lltoolpie.cpp
2021-04-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-29SL-14895, restore previous post-deferred alpha behaviorDave Houlton
2021-03-25SL-15028 Guidebook floaterMnikolenko Productengine
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-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-522-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey 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' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-09DRTVWR-525 housekeeping: delete unused shader fileDave Houlton
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-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 18:45:30 +0000