From 6ef3c100fbc79ec106756f383f5df2be682d5409 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Apr 2018 02:47:35 +0300
Subject: MAINT-8440 Create a tabbed panel for managing users for Region/Estate
 owners

---
 .../skins/default/xui/en/panel_region_access.xml   | 295 +++++++++++++++++++++
 .../skins/default/xui/en/panel_region_estate.xml   | 206 --------------
 2 files changed, 295 insertions(+), 206 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_region_access.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
new file mode 100644
index 0000000000..abadd7aa2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="top|left"
+ height="510"
+ help_topic="panel_region_access_tab"
+ label="Access"
+ layout="topleft"
+ left="0"
+ name="Access"
+ top="320"
+ width="530">
+
+
+<tab_container
+ bottom="-10"
+ follows="all"
+ layout="topleft"
+ left="3"
+ name="tabs"
+ tab_min_width="70"
+ tab_height="30"
+ tab_position="top"
+ top="10"
+ halign="center"
+ right="-5">
+    
+<!-- ============================= ESTATE MANAGERS tab ====================== -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ESTATE MANAGERS"
+    layout="topleft"
+    left="0"
+    help_topic="estate_managers_tab"
+    name="estate_managers_panel"
+    right="-1"
+    top="0">
+    <text
+     type="string"
+     length="1"
+     bottom="34"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="estate_manager_label"
+     top_pad="10"
+     left="10"
+     width="200">
+        Estate Managers:
+    </text>
+    <!-- Estate Managers box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="estate_manager_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Estate Managers buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_estate_manager_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_estate_manager_btn"
+     left_pad="6"
+     width="114" />      
+  </panel>
+        
+        
+<!-- ================================ ALLOWED tab =========================== -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ALLOWED"
+    layout="topleft"
+    left="0"
+    help_topic="allowed_tab"
+    name="allowed_panel"
+    right="-1"
+    top="0">
+   <text
+     type="string"
+     length="1"
+     bottom="34"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="allow_resident_label"
+     top_pad="10"
+     left="10"
+     width="200">
+        Always allowed:
+    </text>
+    <!-- Always allowed box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_avatar_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Always allowed buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_avatar_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_avatar_btn"
+     left_pad="6"
+     width="114" />
+  </panel>
+
+  <!-- ============================= ALLOWED GROUPS tab ======================= -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ALLOWED GROUPS"
+    layout="topleft"
+    left="0"
+    help_topic="allowed_groups_tab"
+    name="allowed_groups_panel"
+    right="-1"
+    top="0">  
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="allow_group_label"
+     top_pad="10"
+     width="200">
+        Groups always allowed:
+    </text>
+    <!-- Groups always allowed box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_group_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Groups always allowed buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_group_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_group_btn"
+     left_pad="6"
+     top_delta="0"
+     width="114" />
+  </panel>
+
+  <!-- ================================ BANNED tab ============================ -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="BANNED"
+    layout="topleft"
+    left="0"
+    help_topic="banned_tab"
+    name="banned_panel"
+    right="-1"
+    top="0">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="ban_resident_label"
+     top_pad="10"
+     width="200">
+        Always banned:
+    </text>
+    <!-- Always banned box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="banned_avatar_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Always banned buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_banned_avatar_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_banned_avatar_btn"
+     left_pad="6"
+     top_delta="0"
+     width="114" />
+  </panel>
+
+
+</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index a0c1dd0be6..0e99fb1c14 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -159,212 +159,6 @@
      top_pad="30"
      left_delta="0"
      width="97" />
-    
-    <text
-     type="string"
-     length="1"
-     bottom="34"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     name="estate_manager_label"
-     top_pad="25"
-     left="10"
-     width="200">
-        Estate Managers:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="280"
-     name="allow_resident_label"
-     top_delta="0"
-     width="200">
-        Always allowed:
-    </text>
-
-    <!-- Estate Managers box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="10"
-     top_pad="-5"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="estate_manager_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Always allowed box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="280"
-     top_delta="0"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_avatar_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Estate Managers buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="10"
-     name="add_estate_manager_btn"
-     top_pad="6"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_estate_manager_btn"
-     left_pad="6"
-     width="114" />
-
-    <!-- Always allowed buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     left="280"
-     label="Add..."
-     layout="topleft"
-     name="add_allowed_avatar_btn"
-     top_delta="0"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_avatar_btn"
-     left_pad="6"
-     top_delta="0"
-     width="114" />
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="allow_group_label"
-     top_pad="10"
-     width="200">
-        Groups always allowed:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="280"
-     name="ban_resident_label"
-     top_delta="0"
-     width="200">
-        Always banned:
-    </text>
-
-    <!-- Groups always allowed box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="10"
-     top_pad="-5"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_group_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Always banned box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="280"
-     top_delta="0"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="banned_avatar_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Groups always allowed buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="10"
-     name="add_allowed_group_btn"
-     top_pad="6"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_group_btn"
-     left_pad="6"
-     top_delta="0"
-     width="114" />
-
-    <!-- Always banned buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="280"
-     name="add_banned_avatar_btn"
-     top_delta="0"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_banned_avatar_btn"
-     top_delta="0"
-     left_pad="6"
-     width="114" />
 
     <button
      follows="left|top"
-- 
cgit v1.2.3


From 8c1d51caf31c7d34c0c6c347576eed141577de2f Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 23 Apr 2018 20:54:08 +0300
Subject: MAINT-8441 Generate Confirmation message when adding a person to a
 estate list

---
 .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  3 ++
 2 files changed, 45 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6aa6653f42..d139534328 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3805,6 +3805,48 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
    type="alertmodal">
 Unable to add banned resident to estate manager 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"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5f30a7e87d..17ce94d2d7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2659,6 +2659,9 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="RegionInfoBannedResidents">Always banned: ([BANNEDAGENTS], max [MAXBANNED])</string>
 	<string name="RegionInfoListTypeAllowedAgents">Always allowed</string>
 	<string name="RegionInfoListTypeBannedAgents">Always banned</string>
+	<string name="RegionInfoAllEstates">all estates</string>
+	<string name="RegionInfoManagedEstates">managed estates</string>
+	<string name="RegionInfoThisEstate">this estate</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
-- 
cgit v1.2.3


From b29c7173c68707c7173c5bc26e54047e8f751c15 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 16 May 2018 23:50:57 +0300
Subject: MAINT-8581 Better handling of adding Estate Managers to Banned list

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d139534328..98cd11fb6c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3806,6 +3806,13 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
 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="AgentIsAlreadyInList"
-- 
cgit v1.2.3


From 99d9befb629c97f7c778c8a9ddfb9d0060d54de9 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 18 May 2018 00:21:39 +0300
Subject: MAINT-8524 Estate Access Management - Viewer side changes for the
 "Banned" list

---
 .../skins/default/xui/en/panel_region_access.xml   | 36 ++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index abadd7aa2d..7f6df426de 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -260,15 +260,33 @@
      left="10"
      top_pad="-5"
      width="498" />
-    <name_list
-     follows="left|top"
-     height="400"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="banned_avatar_name_list"
-     top_delta="0"
-     width="498" />
+      <name_list
+       draw_heading="true"
+       follows="left|top"
+       height="400"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="banned_avatar_name_list"
+       top_delta="0"
+       width="498">
+          <columns
+            label="Name"
+            name="name"
+            width="140" />
+          <columns
+            label="Last login date"
+            name="last_login_date"
+            width="100" />
+          <columns
+            label="Date banned"
+            name="ban_date"
+            width="100" />
+          <columns
+            label="Banned by"
+            name="bannedby"
+            width="140" />
+      </name_list>
     <!-- Always banned buttons -->
     <button
      follows="left|top"
-- 
cgit v1.2.3


From 522f0db9f5eeae1fbe001a05f4a958fb1e56a8f1 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 27 Jun 2018 12:57:04 +0300
Subject: MAINT-8696 FIXED Multiple confirmation floaters can be opened when
 removing an entity from access list

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a1494515ed..3d994f73af 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4630,7 +4630,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
@@ -4659,7 +4660,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>
@@ -4688,8 +4690,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"
@@ -4716,7 +4719,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
-- 
cgit v1.2.3


From 7ee5ee3dfdda7809c1ff3c40d6de2f01e5e207aa Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 3 Jul 2018 14:22:15 +0300
Subject: MAINT-8582 FIXED The message "Group is already in the list" is not
 displayed

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3d994f73af..30ae7c1d09 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3812,6 +3812,13 @@ Unable to add banned resident to estate manager list.
    type="alertmodal">
 Unable to add estate manager [AGENT] to banned list.
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="GroupIsAlreadyInList"
+   type="alertmodal">
+[GROUP] is already in the Allowed Groups list.
+  </notification>
     
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From d21d43743a746a82166c7206f5a7376c2f6cb122 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 11 Jul 2018 22:59:04 +0300
Subject: MAINT-8567 Enabled sorting for the estate access lists

---
 .../skins/default/xui/en/panel_region_access.xml   | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 7f6df426de..84967f466c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -68,9 +68,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="estate_manager_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Estate Managers buttons -->
     <button
      follows="left|top"
@@ -135,9 +141,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="allowed_avatar_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Always allowed buttons -->
     <button
      follows="left|top"
@@ -200,9 +212,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="allowed_group_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Groups always allowed buttons -->
     <button
      follows="left|top"
@@ -261,12 +279,12 @@
      top_pad="-5"
      width="498" />
       <name_list
-       draw_heading="true"
        follows="left|top"
        height="400"
        layout="topleft"
        left_delta="0"
        multi_select="true"
+       draw_heading="true"
        name="banned_avatar_name_list"
        top_delta="0"
        width="498">
-- 
cgit v1.2.3


From 599cd81b8c912d8db377f5be475ea6fd4abaab1d Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 11 Jul 2018 23:14:50 +0300
Subject: MAINT-8692 Estate tab layout improvements

---
 indra/newview/skins/default/xui/en/panel_region_estate.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 0e99fb1c14..9b9c870c49 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -82,7 +82,7 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="105"
+     height="185"
      layout="topleft"
      left="10"
      top_pad="5"
@@ -96,7 +96,7 @@
      width="200">
         <radio_item
          height="16"
-         label="Allow only residents and groups listed below"
+         label="Allow only residents and groups listed on the Access tab"
          layout="topleft"
          name="estate_restricted_access" />
         <radio_item
@@ -137,10 +137,10 @@
      height="18"
      label="Allow Voice Chat"
      layout="topleft"
-     left="290"
+     left="20"
      name="voice_chat_check"
-     top_delta="-78"
-     width="200" />
+     top_pad="2"
+     width="240" />
     <check_box
      height="18"
      label="Allow Direct Teleport"
@@ -148,7 +148,7 @@
      left_delta="0"
      name="allow_direct_teleport"
      top_pad="2"
-     width="80" />
+     width="240" />
     <button
      enabled="false"
      follows="left|top"
@@ -156,7 +156,7 @@
      label="Apply"
      layout="topleft"
      name="apply_btn"
-     top_pad="30"
+     top_pad="10"
      left_delta="0"
      width="97" />
 
-- 
cgit v1.2.3


From 28cdee4e0833c96f4b0c707092814f6ed0bbfd96 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 12 Jul 2018 20:35:01 +0300
Subject: MAINT-8566 Access lists search implementation

---
 .../skins/default/xui/en/panel_region_access.xml   | 80 ++++++++++++++++++++--
 1 file changed, 73 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 84967f466c..4a78cdacf0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -113,6 +113,28 @@
     name="allowed_panel"
     right="-1"
     top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="allowed_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search allowed agents"
+            max_length_chars="300"
+            name="allowed_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
    <text
      type="string"
      length="1"
@@ -130,14 +152,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
     <name_list
      follows="left|top"
-     height="400"
+     height="370"
      layout="topleft"
      left_delta="0"
      multi_select="true"
@@ -184,7 +206,29 @@
     help_topic="allowed_groups_tab"
     name="allowed_groups_panel"
     right="-1"
-    top="0">  
+    top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="allowed_group_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search allowed groups"
+            max_length_chars="300"
+            name="allowed_group_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
     <text
      type="string"
      length="1"
@@ -201,14 +245,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
     <name_list
      follows="left|top"
-     height="400"
+     height="370"
      layout="topleft"
      left_delta="0"
      multi_select="true"
@@ -257,6 +301,28 @@
     name="banned_panel"
     right="-1"
     top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="banned_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search banned agents"
+            max_length_chars="300"
+            name="banned_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
     <text
      type="string"
      length="1"
@@ -273,14 +339,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
       <name_list
        follows="left|top"
-       height="400"
+       height="370"
        layout="topleft"
        left_delta="0"
        multi_select="true"
-- 
cgit v1.2.3


From 5b9ab1b7bfe4f7e0612784d566afc936995abc53 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 13 Jul 2018 18:32:58 +0300
Subject: MAINT-8872 Don't display url-like group name as a link in
 notification

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 30ae7c1d09..e96843b8fe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3817,7 +3817,7 @@ Unable to add estate manager [AGENT] to banned list.
    icon="alertmodal.tga"
    name="GroupIsAlreadyInList"
    type="alertmodal">
-[GROUP] is already in the Allowed Groups list.
+&lt;nolink&gt;[GROUP]&lt;/nolink&gt; is already in the Allowed Groups list.
   </notification>
     
   <notification
-- 
cgit v1.2.3


From 1ea68249d88a603d294628cf966f0e9317425aa1 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 25 Jul 2018 00:02:44 +0300
Subject: MAINT-8583 Fix for the truncated message when removing a large number
 of banned users

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fd2749bb81..d4327b0c7c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2661,6 +2661,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="RegionInfoAllEstates">all estates</string>
 	<string name="RegionInfoManagedEstates">managed estates</string>
 	<string name="RegionInfoThisEstate">this estate</string>
+	<string name="AndNMore">and [EXTRA_COUNT] more</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
-- 
cgit v1.2.3


From 747eccd63faa8595803b253a2dcf4d1732d924ce Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 6 Sep 2018 03:24:06 +0300
Subject: MAINT-8777 added ability to copy access lists to clipboard

---
 .../skins/default/xui/en/panel_region_access.xml   | 30 +++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 4a78cdacf0..4be073195b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -133,7 +133,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+           <button
+            follows="left|top"
+            height="23"
+            label="Copy"
+            layout="topleft"
+            left_pad="10"
+            name="copy_allowed_list_btn"
+            width="40" />
         </panel>
    <text
      type="string"
@@ -227,7 +235,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+           <button
+            follows="left|top"
+            height="23"
+            label="Copy"
+            layout="topleft"
+            left_pad="10"
+            name="copy_allowed_group_list_btn"
+            width="40" />
         </panel>
     <text
      type="string"
@@ -321,7 +337,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+               <button
+                follows="left|top"
+                height="23"
+                label="Copy"
+                layout="topleft"
+                left_pad="10"
+                name="copy_banned_list_btn"
+                width="40" />
         </panel>
     <text
      type="string"
-- 
cgit v1.2.3


From de52689954f575914cc91745808fa6cd6ece021a Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 14 Sep 2018 08:14:05 +0300
Subject: SL-1956 added support for temporary bans to parcel ban list

---
 .../skins/default/xui/en/floater_about_land.xml    |  28 +++++-
 .../skins/default/xui/en/floater_ban_duration.xml  | 100 +++++++++++++++++++++
 2 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_ban_duration.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 535af317d9..841b11e3bc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -21,6 +21,14 @@
       name="maturity_icon_adult">
       "Parcel_R_Dark"
     </floater.string>
+    <floater.string
+     name="Hours">
+        [HOURS] hrs.
+    </floater.string>
+    <floater.string
+     name="Hour">
+        hr.
+    </floater.string>
     <floater.string
      name="Minutes">
         [MINUTES] min.
@@ -37,6 +45,10 @@
      name="Remaining">
         remaining
     </floater.string>
+    <floater.string
+     name="Always">
+        Always
+    </floater.string>
     <tab_container
      follows="all"
      halign="left"
@@ -2063,19 +2075,29 @@ Only large parcels can be listed in search.
              name="BanCheck"
              top="0"
              width="200">
-                Always banned ([COUNT], max [MAX])
+                Banned ([COUNT], max [MAX])
             </text>
             <name_list
              column_padding="0"
              follows="top|bottom"
-             heading_height="14"
+             heading_height="16"
              height="125"
              layout="topleft"
              left="0"
              multi_select="true"
+             draw_heading="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="230" />
+             width="230">
+             <columns
+              label="Name"
+              name="name"
+              width="160" />
+             <columns
+              label="Duration"
+              name="duration"
+              width="70" />
+            </name_list>
             <button
              follows="bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
new file mode 100644
index 0000000000..2d9e69f7c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="true"
+ height="150"
+ layout="topleft"
+ name="ban_duration"
+ title="Ban duration"
+ single_instance="true"
+ width="180">
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    layout="topleft"
+    left="15"
+    name="duration_textbox"
+    top="10"
+    width="75">
+        Ban duration:
+   </text>
+
+   <radio_group
+    draw_border="false"
+    enabled="true"
+    follows="left|top"
+    height="40"
+    left="20"
+    mouse_opaque="true"
+    name="ban_duration_radio"
+    tab_stop="true"
+    width="200">
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Always"
+        name="always_radio">
+            Always
+       </radio_item>
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Temporary"
+        name="temporary_radio">
+            Temporary
+       </radio_item>
+   </radio_group>
+
+   <spinner
+    allow_text_entry="true"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="1"
+    max_val="8766"
+    min_val="1"
+    initial_val="1"
+    name="ban_hours"
+    top_delta="50"
+    left="40"
+    width="40"/>
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    left_delta="50"
+    name="hours_textbox"
+    top_delta="5"
+    width="75">
+        hours.
+   </text>
+    
+   <button
+    follows="left|top"
+    height="23"
+    label="Ok"
+    left="15"
+    name="ok_btn"
+    top_delta="30"
+    width="75">
+   </button>
+   <button
+    follows="left|top"
+    height="23"
+    label="Cancel"
+    left_pad="0"
+    name="cancel_btn"
+    top_delta="0"
+    width="75">
+   </button>
+</floater>
-- 
cgit v1.2.3


From 8525ad02a4745878a95b8077e0d5a33b7f55dda5 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:39:36 +0300
Subject: SL-9691 Ban duration floater - Added validation of input values to
 the 'hours' field

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
index 2d9e69f7c7..b0c961c3c9 100644
--- a/indra/newview/skins/default/xui/en/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -55,7 +55,7 @@
    </radio_group>
 
    <spinner
-    allow_text_entry="true"
+    allow_digits_only="true"
     decimal_digits="0"
     follows="left|top"
     height="20"
-- 
cgit v1.2.3


From e903a52ed630ddc31369fee3d1694a3191c5042a Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:46:55 +0300
Subject: SL-9694 Ban duration floater - Increased spinner width

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
index b0c961c3c9..5562f28877 100644
--- a/indra/newview/skins/default/xui/en/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -66,13 +66,13 @@
     name="ban_hours"
     top_delta="50"
     left="40"
-    width="40"/>
+    width="60"/>
    <text
     type="string"
     length="1"
     follows="left|top"
     height="15"
-    left_delta="50"
+    left_delta="70"
     name="hours_textbox"
     top_delta="5"
     width="75">
-- 
cgit v1.2.3


From b13b56af315b7041b81ca43985a9790a5a01e1bc Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:50:19 +0300
Subject: SL-9695 About Land floater - Column width adjustment

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 841b11e3bc..d04e738b22 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2092,11 +2092,11 @@ Only large parcels can be listed in search.
              <columns
               label="Name"
               name="name"
-              width="160" />
+              width="155" />
              <columns
               label="Duration"
               name="duration"
-              width="70" />
+              width="75" />
             </name_list>
             <button
              follows="bottom"
-- 
cgit v1.2.3