diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-09 21:55:14 +0200 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-09 22:33:52 +0200 |
commit | 6c54c9f8a9e11ba3c00c0ac38c4bb8d3610ccc58 (patch) | |
tree | 1ab66f72ba68c72218ab67142567744aef6843c1 /indra/newview/app_settings/settings.xml | |
parent | 8e03f926c787d02d0860a75e9e8fe0f9013df003 (diff) | |
parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) |
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2f5bf7d148..3f6adfe13d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16876,5 +16876,16 @@ <key>Value</key> <string></string> </map> + <key>DebugSettingsHideDefault</key> + <map> + <key>Comment</key> + <string>Show non-default settings only in Debug Settings list</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |