STORM-1980/1983 Small XML cleanup.

Changed notification type to Alert.
Addes seconds field to notification message.

3 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 48bfdc03ac..805b3aab18 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5967,7 +5967,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 			// being off.
 			time_t utc_time;
 			utc_time = time_corrected();
-			std::string timeStr = LLTrans::getString("ViewerMessageTime");
+			std::string timeStr = LLTrans::getString("HMSTime");
 			LLSD substitution;
 			substitution["datetime"] = (S32) utc_time;
 			LLStringUtil::format(timeStr, substitution);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0a5a0395a..083ff46ebb 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6885,8 +6885,7 @@ This will add a bookmark in your inventory so you can quickly IM this Resident.
    icon="notify.tga"
    name="RegionRestartMinutes"
    priority="high"
-   sound="UISndAlert"
-   type="notify">
+   type="alert">
 [TIME] This region will restart in [MINUTES] minutes.
 If you stay in this region you will be logged out.
   </notification>
@@ -6895,8 +6894,7 @@ If you stay in this region you will be logged out.
    icon="notify.tga"
    name="RegionRestartSeconds"
    priority="high"
-   sound="UISndAlert"
-   type="notify">
+   type="alert">
 [TIME] This region will restart in [SECONDS] seconds.
 If you stay in this region you will be logged out.
   </notification>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3fc1609cd4..4534434c46 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2552,7 +2552,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
   <string name="DoNotDisturbModeResponseDefault">This resident has turned on &apos;Do Not Disturb&apos; and will see your message later.</string>
 
 	<!-- viewermessage -->
-	<string name="ViewerMessageTime">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</string>
+	<string name="HMSTime">[hour12, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</string>
 
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>