diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-03-02 00:46:10 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-03-02 00:46:10 +0200 |
| commit | 0aaf5284dced4ec41924c771a382d12ddc5f3d1b (patch) | |
| tree | 448ad9399feee611f992ceeb667cd4e47e9ab594 /indra/newview/app_settings/settings.xml | |
| parent | 882600de2afa366729be870355767282247be0ef (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-539
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 43e554e532..bb83824628 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8352,7 +8352,7 @@ <key>PushToTalkToggle</key> <map> <key>Comment</key> - <string>Should the push-to-talk button behave as a toggle</string> + <string>Should the push-to-talk toolbar button behave as a toggle</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -8396,7 +8396,18 @@ <key>QAModeMetrics</key> <map> <key>Comment</key> - <string>"Enables QA features (logging, faster cycling) for metrics collector"</string> + <string>Enables QA features (logging, faster cycling) for metrics collector</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>QAModeFakeSystemFolderIssues</key> + <map> + <key>Comment</key> + <string>Simulates system folder issues in inventory</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -12579,6 +12590,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>TextureFetchMinTimeToLog</key> + <map> + <key>Comment</key> + <string>If texture fetching time exceeds this value, texture fetch tester will log info</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>2.0</real> + </map> <key>TextureFetchFakeFailureRate</key> <map> <key>Comment</key> @@ -12667,6 +12689,17 @@ <key>Value</key> <integer>32</integer> </map> + <key>TextureListFetchingThreshold</key> + <map> + <key>Comment</key> + <string>If the ratio between fetched and all textures in the list is greater than this threshold, which we assume that almost all textures are fetched</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.97</real> + </map> <key>TextureLoadFullRes</key> <map> <key>Comment</key> |