summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-02-19 16:13:42 -0800
committerRider Linden <rider@lindenlab.com>2019-02-19 16:13:42 -0800
commit4f14dccffaa3b38377ad55486e38e4587a233319 (patch)
treed43ed9640fc0d67a3e11afc0f2b2f1d146ceed98 /indra/newview/skins/default
parentf489a8915198b5846c744d3cb2c7ed7447bfe35e (diff)
SL-10570: Additional checking when loading a track from another day cycle. Restore original track if error. Extra messages to user.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml27
1 files changed, 27 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dfc392e1f7..5ed3bd5df5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11347,5 +11347,32 @@ You may not edit settings directly from the libary.
Please copy to your own inventory and try again.
<tag>fail</tag>
</notification>
+
+ <notification
+ icon="notify.tga"
+ name="EnvironmentApplyFailed"
+ persist="true"
+ type="alertmodal">
+We have encountered an issue with these settings. They can not be saved or applied at this time.
+ <tag>fail</tag>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TrackLoadFailed"
+ persist="true"
+ type="alertmodal">
+Unable to load the track into [TRACK].
+ <tag>fail</tag>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TrackLoadMismatch"
+ persist="true"
+ type="alertmodal">
+Unable to load the track from [TRACK1] into [TRACK2].
+ <tag>fail</tag>
+ </notification>
</notifications>