From 09964ec6ede2c9dba5954448bff6b2da2dc179af Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 24 Sep 2013 19:10:43 -0700
Subject: Created an experience specific permissions dialog.

---
 .../newview/skins/default/xui/en/notifications.xml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ebd2799ebf..ef4044bedd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6930,6 +6930,40 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+  <notification
+   icon="notify.tga"
+   name="ScriptQuestionExperience"
+   persist="true"
+   type="notify">
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
+
+[EXPERIENCE]
+
+Once permission is granted you will not see this message again for this experience unless it is revoked from the experience profile.
+
+Scripts associated with this experience will be able to do the following on regions where the experience is active: 
+
+[QUESTIONS]Is this OK?
+  <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+      <button
+        index="2"
+        name="Mute"
+        text="Block Object"/>
+      <button
+       index="3"
+       name="BlockExperience"
+       text="Block Experience"/>
+    </form>
+  </notification>
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From b932dbd1193f911691e918f6bee96da88b3c71e5 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 5 Dec 2013 10:47:44 -0800
Subject: Added notification for experience declined due to maturity

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0f9a728116..0acdf100a4 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6985,10 +6985,22 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+  <notification
+    icon="notify.tga"
+    name="ExperienceMaturityExceeded"
+    persist="false"
+    type="notify">
+You have declined participation in the following experience which exceeds your content ratings preferences:
+[EXPERIENCE_SLURL]
+    <form name="form">
+      <ignore name="ignore"
+              text="Experience declined due to content ratings"/>
+    </form>
+  </notification>
   <notification
    icon="notify.tga"
    name="ScriptQuestionExperience"
-   persist="true"
+   persist="false"
    type="notify">
 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
 
-- 
cgit v1.2.3


From 8b690a3fdfb24aea23150031768e0734043195aa Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 11 Feb 2014 15:25:00 -0800
Subject: Updated message for TeleportedHomeExperienceRemoved

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0acdf100a4..1afd56cc74 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6987,14 +6987,13 @@ Is this OK?
   </notification>
   <notification
     icon="notify.tga"
-    name="ExperienceMaturityExceeded"
-    persist="false"
+    name="TeleportedHomeExperienceRemoved"
+    persist="true"
     type="notify">
-You have declined participation in the following experience which exceeds your content ratings preferences:
-[EXPERIENCE_SLURL]
+    You have been teleported from the [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
       <ignore name="ignore"
-              text="Experience declined due to content ratings"/>
+              text="Kicked from region for removing an experience"/>
     </form>
   </notification>
   <notification
-- 
cgit v1.2.3


From c1f730ed46c14c12d5856109b622bf085c39abb0 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 26 Feb 2014 17:32:21 -0800
Subject: Moved the experience acquire code to the experiences panel

---
 indra/newview/skins/default/xui/en/notifications.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d473b8de00..75a7240c9e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6985,6 +6985,21 @@ Is this OK?
        text="Block"/>
     </form>
   </notification>
+
+  <notification
+    icon="alertmodal.tga"
+    name="ExperienceAcquireFailed"
+    type="alertmodal">
+Unable to acquire a new experience:
+    [ERROR_MESSAGE]
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+  
+  
+  
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
-- 
cgit v1.2.3


From 49f08d775d3644bb47d342f8e37dd15051aeaa62 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Fri, 28 Feb 2014 16:21:42 -0800
Subject: Add group editing for experiences

---
 .../newview/skins/default/xui/en/notifications.xml  | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 75a7240c9e..0da1e546ee 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6997,20 +6997,33 @@ Unable to acquire a new experience:
       name="okbutton"
       yestext="OK"/>
   </notification>
-  
-  
-  
+
+
+
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
     persist="true"
     type="notify">
-    You have been teleported from the [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
+    You have been teleported from the region [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
       <ignore name="ignore"
               text="Kicked from region for removing an experience"/>
     </form>
   </notification>
+
+  <notification
+    icon="notify.tga"
+    name="TrustedExperienceEntry"
+    persist="true"
+    type="notify">
+    You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+    <form name="form">
+      <ignore name="ignore"
+              text="Allowed into a region by an experience"/>
+    </form>
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="ScriptQuestionExperience"
-- 
cgit v1.2.3


From 7b9817cbcc5acab58d9d4355984b429850bd3ef8 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Mon, 10 Mar 2014 10:15:19 -0700
Subject: Fixed a bug that lost callbacks if > 10 experiences were looked up at
 a time.

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

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0da1e546ee..9482ebb520 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7003,7 +7003,7 @@ Unable to acquire a new experience:
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
-    persist="true"
+    persist="false"
     type="notify">
     You have been teleported from the region [region_name] for removing the experience secondlife:///app/experience/[public_id]/profile and are no longer permitted in the region.
     <form name="form">
@@ -7015,7 +7015,7 @@ Unable to acquire a new experience:
   <notification
     icon="notify.tga"
     name="TrustedExperienceEntry"
-    persist="true"
+    persist="false"
     type="notify">
     You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
     <form name="form">
-- 
cgit v1.2.3


From 9fe5728b4385ead4a4c74eed7917d93060510cdb Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Wed, 12 Mar 2014 09:50:08 -0700
Subject: Show ignored items when updating an experience profile

---
 .../newview/skins/default/xui/en/notifications.xml | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b7d5940434..e0cc2229d5 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7006,8 +7006,46 @@ Unable to acquire a new experience:
       yestext="OK"/>
   </notification>
 
+  <notification
+    icon="notify.tga"
+    name="NotInGroupExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    A change to the experience group was ignored because the owner is not a member of the selected group.
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="UneditableExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    The uneditable field '[field]' was ignored when updating the experience profile.
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="RestrictedToOwnerExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    Ignored changes to the field '[field]' which can only be set by the experience owner.
+  </notification>
 
+  <notification
+    icon="notify.tga"
+    name="MaturityRatingExceedsOwnerExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    You may not set the maturity rating of an experience higher than that of the owner.
+  </notification>
 
+  <notification
+    icon="notify.tga"
+    name="RestrictedTermExperienceProfileMessage"
+    persist="false"
+    type="notify">
+    The following terms prevented the update of the experience profile name and/or description: [extra_info]
+  </notification>
+  
   <notification
     icon="notify.tga"
     name="TeleportedHomeExperienceRemoved"
-- 
cgit v1.2.3


From b2591ca63c498ab606bf595e0b2e729e76caea24 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 18 Mar 2014 14:12:22 -0700
Subject: Added a default message handler for experience logs. Currently just
 forwards the   notification.

---
 indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e0cc2229d5..b230e36cc7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7069,6 +7069,26 @@ Unable to acquire a new experience:
               text="Allowed into a region by an experience"/>
     </form>
   </notification>
+
+  <notification
+    icon="notify.tga"
+    name="ExperienceEvent"
+    persist="false"
+    type="notify">
+    An object was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+    Owner: secondlife:///app/agent/[OwnerID]/inspect
+    Object Name: [ObjectName]
+    Parcel Name: [ParcelName]
+  </notification>
+
+  <notification
+    icon="notify.tga"
+    name="ExperienceEventAttachment"
+    persist="false"
+    type="notify">
+    An attachment was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
+    Owner: secondlife:///app/agent/[OwnerID]/inspect
+  </notification>
   
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From dba034ee100dae4b62ddf12523835a413a25f189 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 20 Mar 2014 16:32:31 -0700
Subject: Experience log panel

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

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b230e36cc7..edcc401b9a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7074,7 +7074,7 @@ Unable to acquire a new experience:
     icon="notify.tga"
     name="ExperienceEvent"
     persist="false"
-    type="notify">
+    type="notifytip">
     An object was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
     Owner: secondlife:///app/agent/[OwnerID]/inspect
     Object Name: [ObjectName]
@@ -7085,7 +7085,7 @@ Unable to acquire a new experience:
     icon="notify.tga"
     name="ExperienceEventAttachment"
     persist="false"
-    type="notify">
+    type="notifytip">
     An attachment was allowed to [EventType] by the secondlife:///app/experience/[public_id]/profile experience.
     Owner: secondlife:///app/agent/[OwnerID]/inspect
   </notification>
-- 
cgit v1.2.3


From 80fcd6d9d42377fc09928eb99f26e6287c4b544d Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 24 Apr 2014 14:00:15 -0700
Subject: If an agent fails to teleport into a region with trusted experiences
 and they pass all other checks then a list of experiences will be presented
 to them.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d20d94d619..5e966395dc 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7070,6 +7070,17 @@ Unable to acquire a new experience:
     </form>
   </notification>
 
+  <notification
+    icon="notify.tga"
+    name="TrustedExperiencesAvailable"
+    persist="false"
+    type="notify">
+You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
+
+[EXPERIENCE_LIST]
+  </notification>
+    
+
   <notification
     icon="notify.tga"
     name="ExperienceEvent"
-- 
cgit v1.2.3


From f1fd98b6ed73d6ef7243870b8efd7fc848fa5be7 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 1 May 2014 00:51:28 +0100
Subject: Changed layout of exp perms buttons for ACME-1468

---
 indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5e966395dc..ee007197d7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7117,6 +7117,14 @@ Scripts associated with this experience will be able to do the following on regi
 [QUESTIONS]Is this OK?
   <tag>confirm</tag>
     <form name="form">
+      <button
+       index="3"
+       name="BlockExperience"
+       text="Block Experience"/>
+      <button
+        index="2"
+        name="Mute"
+        text="Block Object"/>
       <button
        index="0"
        name="Yes"
@@ -7125,14 +7133,6 @@ Scripts associated with this experience will be able to do the following on regi
        index="1"
        name="No"
        text="No"/>
-      <button
-        index="2"
-        name="Mute"
-        text="Block Object"/>
-      <button
-       index="3"
-       name="BlockExperience"
-       text="Block Experience"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3


From ae856ef31830912cec0f4de37167858a24e4ba30 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 6 May 2014 22:53:40 +0100
Subject: Made experience permissions notifications unique based on
 experienceid only for ACME-1471

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ee007197d7..778a9b432c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7115,6 +7115,10 @@ Once permission is granted you will not see this message again for this experien
 Scripts associated with this experience will be able to do the following on regions where the experience is active: 
 
 [QUESTIONS]Is this OK?
+
+  <unique combine="replace_with_new">
+    <context>experience</context>
+  </unique>
   <tag>confirm</tag>
     <form name="form">
       <button
-- 
cgit v1.2.3


From 43d12faffebe327b32724abbb5612e0351a18976 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 17 May 2014 04:21:56 +0100
Subject: Added COMBINE_WITH_NEW for notifications for ACME-1471

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 778a9b432c..ac78ae6a3e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7116,7 +7116,7 @@ Scripts associated with this experience will be able to do the following on regi
 
 [QUESTIONS]Is this OK?
 
-  <unique combine="replace_with_new">
+  <unique combine="combine_with_new">
     <context>experience</context>
   </unique>
   <tag>confirm</tag>
-- 
cgit v1.2.3


From 8924b2807585231fa40757ee4b76a0adbb2e3009 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 30 May 2014 03:49:22 +0100
Subject: Added a popup for choosing this or all estates when adding/removing
 an experience in the Region/Estate floater for ACME-1436

---
 .../newview/skins/default/xui/en/notifications.xml | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2e804c2404..b207051ec8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4358,6 +4358,90 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
      yestext="This Estate"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedExperienceAdd"
+   type="alert">
+    Add to allowed list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedExperienceRemove"
+   type="alert">
+    Remove from allowed list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBlockedExperienceAdd"
+   type="alert">
+    Add to blocked list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBlockedExperienceRemove"
+   type="alert">
+    Remove from blocked list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateTrustedExperienceAdd"
+   type="alert">
+    Add to trusted list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateTrustedExperienceRemove"
+   type="alert">
+    Remove from trusted list for this estate only or for [ALL_ESTATES]?
+    <tag>confirm</tag>
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>  
+
   <notification
    icon="alert.tga"
    label="Confirm Kick"
-- 
cgit v1.2.3


From 8cc8e7dc77c7aff6d4698632d6a3bebe76698ff7 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 28 Oct 2014 11:43:45 -0700
Subject: ACME-1601: Updated message to match behavior ACME-1616: Change
 references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"  to
 "Land-Scope"

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f208b979f..8960fad02b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7326,7 +7326,7 @@ You do not have access to this destination. You may be allowed into the region b
    name="ScriptQuestionExperience"
    persist="false"
    type="notify">
-&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE] experience:
 
 [EXPERIENCE]
 
-- 
cgit v1.2.3


From c2a516aee1f8c1e26124a77f62962944137ef960 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Thu, 6 Nov 2014 16:25:17 -0800
Subject: ACME-1635: Trusted Experiences now referred to as Key Experiences.

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

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8960fad02b..fa5c1cda4a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7298,6 +7298,8 @@ Unable to acquire a new experience:
 You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
 
 [EXPERIENCE_LIST]
+
+Other Key Experiences may be available.
   </notification>
     
 
-- 
cgit v1.2.3


From e21f8284fdd9cd86e2822b233775e9a3d77917d5 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 21 Nov 2014 19:36:18 +0200
Subject: ACME-1639 FIXED A few references to "Trusted Experiences" need to be
 changed to Key experiences

---
 indra/newview/skins/default/xui/en/notifications.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fa5c1cda4a..61385e9805 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4509,7 +4509,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceAdd"
    type="alert">
-    Add to trusted list for this estate only or for [ALL_ESTATES]?
+    Add to key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -4523,7 +4523,7 @@ Remove estate manager for this estate only or for [ALL_ESTATES]?
    label="Select estate"
    name="EstateTrustedExperienceRemove"
    type="alert">
-    Remove from trusted list for this estate only or for [ALL_ESTATES]?
+    Remove from key list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -7283,7 +7283,7 @@ Unable to acquire a new experience:
     name="TrustedExperienceEntry"
     persist="false"
     type="notify">
-    You have been allowed into the region [region_name] by participating in the trusted experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
+    You have been allowed into the region [region_name] by participating in the key experience secondlife:///app/experience/[public_id]/profile removing this experience may kick you from the region.
     <form name="form">
       <ignore name="ignore"
               text="Allowed into a region by an experience"/>
-- 
cgit v1.2.3