From 90c6b871c49e5936639cfc181d6119fc1a8a3f08 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 17 May 2012 17:12:00 -0700
Subject: EXP-1928: Constructing the new maturity preferences flow for the case
 of a teleport via lure (which cannot be restared).

---
 .../newview/skins/default/xui/en/notifications.xml | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0fe320f92b..cd28b5a770 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4107,7 +4107,7 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
 
   <notification
    icon="alertmodal.tga"
-   name="RegionEntryAccessBlocked_Change"
+   name="RegionEntryAccessBlocked_ChangeAndReTeleport"
    type="alertmodal">
    <tag>fail</tag>
     <tag>confirm</tag>
@@ -4126,6 +4126,27 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="RegionEntryAccessBlocked_ChangeOnly"
+   type="alertmodal">
+    <tag>fail</tag>
+    <tag>confirm</tag>
+The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel the teleport. After your preferences are changed, you will need to attempt the teleport again.
+    <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change preferences"/>
+      <button 
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+      <ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/>
+    </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PreferredMaturityChanged"
@@ -4141,7 +4162,7 @@ You won't receive any more notifications that you're about to visit a region wit
    icon="alertmodal.tga"
    name="MaturityCouldNotBeChanged"
    type="alertmodal">
-We were unable to change your preferences to view [RATING] content at this time.  Please attempt to change your preferences by using Me &gt; Preferences &gt; General from the menu bar, and then retrying your teleport.
+We were unable to change your preferences to view [RATING] content at this time.  Please change your preferences by using Me &gt; Preferences &gt; General from the menu bar, and then attempt your teleport again.
     <tag>confirm</tag>
     <usetemplate
      name="okbutton"
-- 
cgit v1.2.3