summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2013-11-05 17:47:00 -0500
committerJonathan Yap <none@none>2013-11-05 17:47:00 -0500
commit7d4deed8bef62cee1fc782a9676505136b231412 (patch)
tree0f18e21601fbfa9533fd7fe07169162e33afed4c /indra/newview
parentceb15e6edeed5d0e1fb7eaab9bc5b1592a252303 (diff)
STORM-1980/1983 Attempt to test alert message with a new uploaded sound
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermessage.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index bcd535bb90..51260c98cd 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5960,21 +5960,21 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE);
}
- if (notificationID == "RegionRestartMinutes" ||
- notificationID == "RegionRestartSeconds")
- {
- // Get current UTC time, adjusted for the user's clock
- // being off.
- time_t utc_time;
- utc_time = time_corrected();
- std::string timeStr = LLTrans::getString("ViewerMessageTime");
- LLSD substitution;
- substitution["datetime"] = (S32) utc_time;
- LLStringUtil::format(timeStr, substitution);
- llsdBlock["TIME"] = timeStr;
+ if (notificationID == "RegionRestartMinutes" ||
+ notificationID == "RegionRestartSeconds")
+ {
+ // Get current UTC time, adjusted for the user's clock
+ // being off.
+ time_t utc_time;
+ utc_time = time_corrected();
+ std::string timeStr = LLTrans::getString("ViewerMessageTime");
+ LLSD substitution;
+ substitution["datetime"] = (S32) utc_time;
+ LLStringUtil::format(timeStr, substitution);
+ llsdBlock["TIME"] = timeStr;
- send_sound_trigger(LLUUID(gSavedSettings.getString("UISndAlert")), 1.0f);
- }
+ send_sound_trigger(LLUUID("4b315701-1972-9e23-cdd8-23cbc8cb0f42"), 1.0f);
+ }
LLNotificationsUtil::add(notificationID, llsdBlock);
return true;