summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorsimon <none@none>2014-02-10 15:42:25 -0800
committersimon <none@none>2014-02-10 15:42:25 -0800
commit4acc2dc2736621952b6ee0e808640dcf79e341c6 (patch)
tree9decb3ccc69bfee8fcaeb583bf0c6f6afd7b1243 /indra/newview/app_settings/settings.xml
parent1be85e1a0a2a2d607c74acb684412b6c3b307e6f (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fe6622f1e3..e601b82f23 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12643,6 +12643,17 @@
<key>Value</key>
<string>00000000-0000-0000-0000-000000000000</string>
</map>
+ <key>UISndRestart</key>
+ <map>
+ <key>Comment</key>
+ <string>Sound file for region restarting (uuid for sound asset)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>b92a0f64-7709-8811-40c5-16afd624a45f</string>
+ </map>
<key>UISndSnapshot</key>
<map>
<key>Comment</key>
@@ -14882,17 +14893,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DisablePrecacheDelayAfterTeleporting</key>
- <map>
- <key>Comment</key>
- <string>Disables the artificial delay in the viewer that precaches some incoming assets</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>FMODExProfilerEnable</key>
<map>
<key>Comment</key>