Merge

1 files changed, 65 insertions, 5 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d521074453..cf13b47594 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3815,6 +3815,62 @@ Can't add estate owner to estate 'Banned Resident' list.
    type="alertmodal">
 Unable to add banned resident to estate manager list.
   </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemBanningEstateManager"
+   type="alertmodal">
+Unable to add estate manager [AGENT] to banned list.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="GroupIsAlreadyInList"
+   type="alertmodal">
+&lt;nolink&gt;[GROUP]&lt;/nolink&gt; is already in the Allowed Groups list.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentIsAlreadyInList"
+   type="alertmodal">
+[AGENT] is already in your [LIST_TYPE] list.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsAreAlreadyInList"
+   type="alertmodal">
+[AGENT] are already in your [LIST_TYPE] list.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentWasAddedToList"
+   type="alertmodal">
+[AGENT] was added to [LIST_TYPE] list of [ESTATE].
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsWereAddedToList"
+   type="alertmodal">
+[AGENT] were added to [LIST_TYPE] list of [ESTATE].
+
+  </notification>
+      <notification
+   icon="alertmodal.tga"
+   name="AgentWasRemovedFromList"
+   type="alertmodal">
+[AGENT] was removed from [LIST_TYPE] list of [ESTATE].
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsWereRemovedFromList"
+   type="alertmodal">
+[AGENT] were removed from [LIST_TYPE] list of [ESTATE].
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -4616,7 +4672,8 @@ Add to allowed list for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateAllowedAgentRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove from allowed list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
@@ -4645,7 +4702,8 @@ Add to group allowed list for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateAllowedGroupRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove from group allowed list for this estate only or [ALL_ESTATES]?
     <tag>group</tag>
     <tag>confirm</tag>
@@ -4674,8 +4732,9 @@ Deny access for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateBannedAgentRemove"
-   type="alert">
-Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
+   type="alertmodal">
+    <unique/>
+Remove this Resident from the ban list for access for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -4702,7 +4761,8 @@ Add estate manager for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateManagerRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove estate manager for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate