summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-05-22 17:49:56 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-05-22 17:49:56 -0700
commit49b48ed0b98efa1c006ebab51d729b74326ebc9b (patch)
tree1d39da454359c09bcad674a1314b3603afabd29c /indra/newview/skins/default
parente4b99957be012038c079ededd4321320b766d08e (diff)
EXP1-1945: Adding in a flow to catch other cases of teleportation failures due to maturity levels and bad network access. Still need better copy for the error message.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cd85f945f3..1c029827ed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4145,6 +4145,17 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
<notification
icon="alertmodal.tga"
+ name="RegionEntryAccessBlocked_PreferencesOutOfSync"
+ type="alertmodal">
+ <tag>fail</tag>
+ We are having technical difficulties with your teleport because your preferences are out of sync with the server.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="PreferredMaturityChanged"
type="alertmodal">
You won't receive any more notifications that you're about to visit a region with [RATING] content. You may change your content preferences in the future by using Me &gt; Preferences &gt; General from the menu bar.