diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
| commit | 2e948a8dc678d3bb5f1d4f34a04efac79b952187 (patch) | |
| tree | 601637c76d2118a803ee79f91339453e1bc5f676 /indra/newview/app_settings/settings.xml | |
| parent | bd800bc2efbba57b66c4a776ac399b3680d184b5 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Pull merge from lindenlab/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 80d55e03ba..0ab0f4e561 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> |