summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorsimon <none@none>2014-06-17 10:40:42 -0700
committersimon <none@none>2014-06-17 10:40:42 -0700
commit592024b5805a116c9d0bef893127427df0741b41 (patch)
treebcadc0685873b40e23254cf3d6232e8f1f3f0e1b /indra/newview/app_settings
parent9e855b03b7f285794520eaf781b6a963b6cd51d9 (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
Merge viewer-release and become version 3.7.9
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/logcontrol.xml1
-rwxr-xr-xindra/newview/app_settings/settings.xml11
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 7da047aed5..15cb5bc0eb 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -43,6 +43,7 @@
<key>tags</key>
<array>
<!-- sample entry for debugging specific items
+ <string>Inventory</string>
<string>SceneLoadTiming</string>
<string>Avatar</string>
<string>Voice</string>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4bbd48facf..6081729687 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11760,6 +11760,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>TextureFetchFakeFailureRate</key>
+ <map>
+ <key>Comment</key>
+ <string>Simulate HTTP fetch failures for some server bake textures.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <integer>0.0</integer>
+ </map>
<key>TextureFetchSource</key>
<map>
<key>Comment</key>