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 +++++++++++
 indra/newview/llviewermessage.cpp       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f66b3ba805..48bfdc03ac 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5973,7 +5973,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 			LLStringUtil::format(timeStr, substitution);
 			llsdBlock["TIME"] = timeStr;
 
-			send_sound_trigger(LLUUID(gSavedSettings.getString("UISndAlert")), 1.0f);
+			send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);
 		}
 
 		LLNotificationsUtil::add(notificationID, llsdBlock);
-- 
cgit v1.2.3