summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Collapse)Author
2021-11-05SL-16320 Remove references to AvaLine from the viewerAndrey Kleshchev
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-10Fix for SL-15381 Import Vivox VAD voice fixes into 'Viewer UI changes' branchCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-19SL-15268 update the description of the 'VivoxVadSensitivity' debug settingMnikolenko Productengine
2021-05-14Fixes SL-14897 Disable Flash support in the embedded browserCallum Prentice
2021-05-13Merge branch 'DRTVWR-533' into DRTVWR-516-maintAndrey Lihatskiy
2021-04-29Expose the flag to turn automatic VAD on and off. We will likely keep it ↵Callum Prentice
off since that appears to be working well for us but others may want to turn in on
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-533Callum Prentice
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-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-516-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-25SL-15028 Guidebook floaterMnikolenko Productengine
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
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-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-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-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-516-maintAndrey Lihatskiy
2021-01-27SL-13490 fix debug normals under non-uniform scaleDave Houlton
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-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 13:51:18 +0000