summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2013-11-05 15:45:48 -0500
committerJonathan Yap <none@none>2013-11-05 15:45:48 -0500
commitceb15e6edeed5d0e1fb7eaab9bc5b1592a252303 (patch)
treeda04886bbc2d6497a1665142808a6f8e5537fc65 /indra/newview/skins
parentcaaaa1e5e6444fa7d96a5bda792cea797b716282 (diff)
STORM-1980/1983 Add time to region restarting message
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e7c89db069..a0a5a0395a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6887,7 +6887,7 @@ This will add a bookmark in your inventory so you can quickly IM this Resident.
priority="high"
sound="UISndAlert"
type="notify">
-This region will restart in [MINUTES] minutes.
+[TIME] This region will restart in [MINUTES] minutes.
If you stay in this region you will be logged out.
</notification>
@@ -6897,7 +6897,7 @@ If you stay in this region you will be logged out.
priority="high"
sound="UISndAlert"
type="notify">
-This region will restart in [SECONDS] seconds.
+[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 8ac95beddb..3fc1609cd4 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2551,6 +2551,9 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
<!-- panel preferences general -->
<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>
+
<!-- Mute -->
<string name="MuteByName">(By name)</string>
<string name="MuteAgent">(Resident)</string>