diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-05-17 17:12:00 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-17 17:12:00 -0700 |
| commit | 90c6b871c49e5936639cfc181d6119fc1a8a3f08 (patch) | |
| tree | 23870b5d5f840aebd7af9e72bd143e6a50601d53 /indra/newview/skins/default/xui | |
| parent | cf0a6a61bd44b4becfa81eb3e0c6b16bc42c4c44 (diff) | |
EXP-1928: Constructing the new maturity preferences flow for the case of a teleport via lure (which cannot be restared).
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 25 |
1 files changed, 23 insertions, 2 deletions
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> @@ -4128,6 +4128,27 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu <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" 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 > Preferences > General from the menu bar. @@ -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 > Preferences > 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 > Preferences > General from the menu bar, and then attempt your teleport again. <tag>confirm</tag> <usetemplate name="okbutton" |