summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2014-02-24 10:57:53 -0500
committerJonathan Yap <none@none>2014-02-24 10:57:53 -0500
commit199e65a6c5584dfcdd24d6885dd9b19bf0af953a (patch)
tree412bbb39e483f4a7460ceefc8cad8b552637f004
parentce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff)
STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only.
-rwxr-xr-xdoc/contributions.txt1
-rwxr-xr-xindra/newview/llviewermessage.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 89390d9977..d1147394f8 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -691,6 +691,7 @@ Jonathan Yap
STORM-1987
STORM-1986
STORM-1981
+ STORM-2015
Kadah Coba
STORM-1060
STORM-1843
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 267aa9532c..d1524b74cd 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5985,7 +5985,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
}
}
- send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);
+ make_ui_sound("UISndRestart");
}
LLNotificationsUtil::add(notificationID, llsdBlock);