From 2454bcc8db5952a16bd3a880825bf6a1b7086c3c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 5 Nov 2013 10:24:41 -0500
Subject: STORM-=1982 Remove duplicate entry in settings.xml

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 41aac583d7..50b0e54f5d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14860,17 +14860,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>
-- 
cgit v1.2.3


From 662efccfb821c2bf61c286aeec97563d7f95a9f8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 6 Nov 2013 15:11:11 -0500
Subject: STORM-1980/1983 Add debug setting UISndRestart and value.  This UUID
 will need to be replaced with an official UUID once one has been established.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 41aac583d7..be5f81e7e7 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>4b315701-1972-9e23-cdd8-23cbc8cb0f42</string>
+    </map>
     <key>UISndSnapshot</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 02afa9cfb050fbc23f5de89bd0adcdc0fb832dea Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 18 Dec 2013 13:39:18 -0500
Subject: STORM-1980: set new region restart sound uuid

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index abe7b95266..b6b9f40db7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12641,7 +12641,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>4b315701-1972-9e23-cdd8-23cbc8cb0f42</string>
+      <string>b92a0f64-7709-8811-40c5-16afd624a45f</string>
     </map>
     <key>UISndSnapshot</key>
     <map>
-- 
cgit v1.2.3