diff options
| author | Jonathan Yap <none@none> | 2013-11-05 10:01:41 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-05 10:01:41 -0500 |
| commit | caaaa1e5e6444fa7d96a5bda792cea797b716282 (patch) | |
| tree | 643584f94f419754d317dce394820cea91b71c2b | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
STORM-1980 Play sound for region restarting message
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 99527c0587..c50c57feea 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -674,6 +674,7 @@ Jonathan Yap OPEN-161 STORM-1953 STORM-1957 + STORM-1980 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ab9ea5618e..ebc6ff8165 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6085,6 +6085,7 @@ void process_alert_core(const std::string& message, BOOL modal) LLStringUtil::convertToS32(text.substr(18), mins); args["MINUTES"] = llformat("%d",mins); LLNotificationsUtil::add("RegionRestartMinutes", args); + send_sound_trigger(LLUUID(gSavedSettings.getString("UISndAlert")), 1.0f); } else if (text.substr(0,17) == "RESTART_X_SECONDS") { @@ -6092,6 +6093,7 @@ void process_alert_core(const std::string& message, BOOL modal) LLStringUtil::convertToS32(text.substr(18), secs); args["SECONDS"] = llformat("%d",secs); LLNotificationsUtil::add("RegionRestartSeconds", args); + send_sound_trigger(LLUUID(gSavedSettings.getString("UISndAlert")), 1.0f); } else { |