diff options
| author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
| commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
| tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/newview/app_settings/settings.xml | |
| parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
| parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) | |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 318b123f50..671b679d24 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12621,6 +12621,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> @@ -14860,17 +14871,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> |