diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
| commit | fcac9fdaddaea6ec94d1c3726c8f19809d696169 (patch) | |
| tree | 1b7c9c8412323110664154e1189b7fa854b524ba /indra/newview/app_settings/settings.xml | |
| parent | ad40f7534fdae6ec85597bbfce32e72248cd61fa (diff) | |
| parent | a25bcb8523db08877c47fdbd834589ebbe45ff82 (diff) | |
merge changes for Snowstorm fall contributions
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 d9093c2a6d..db151817e0 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12632,6 +12632,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> @@ -14871,17 +14882,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> |