From 854c251feffe9bf194bc4e63fd0de28bd20ff995 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 25 Jun 2014 20:09:33 +0300
Subject: MAINT-4178 FIXED [Group Bans] The viewer allows you to attempt to ban
 when the ban list already contains 500 entries, which fails.

---
 .../skins/default/xui/en/panel_group_bulk_ban.xml  | 38 +++++++++++++---------
 .../skins/default/xui/en/panel_group_roles.xml     | 13 ++++++++
 2 files changed, 36 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
index 31989f2e16..509dcf354e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -15,28 +15,36 @@
      name="ban_selection_too_large">
     Group bans not sent: too many Residents selected. Group bans are limited to 100 per request.
   </panel.string>
-	<panel.string
+  <panel.string
      name="ban_not_permitted">
-		Group ban not sent: you do not have 'Manage ban list' ability.
-	</panel.string>
-	<panel.string
+    Group ban not sent: you do not have 'Manage ban list' ability.
+  </panel.string>
+  <panel.string
+     name="ban_limit_fail">
+    Group ban not sent: your group have reached limit of allowed ban records.
+  </panel.string>
+  <panel.string
      name="partial_ban">
-		Some group bans were not sent:
+    Some group bans were not sent:
 [REASONS]
-	</panel.string>
-	<panel.string
+  </panel.string>
+  <panel.string
      name="ban_failed">
-		Group bans were not sent:
+    Group bans were not sent:
 [REASONS]
-	</panel.string>
-	<panel.string
+  </panel.string>
+  <panel.string
      name="residents_already_banned">
-		- The following resident(s) are already banned: [RESIDENTS].
-	</panel.string>
-	<panel.string
+    - The following resident(s) are already banned: [RESIDENTS].
+  </panel.string>
+  <panel.string
+     name="ban_limit_reached">
+    - Ban limit reached, following agents not banned: [RESIDENTS].
+  </panel.string>
+  <panel.string
      name="cant_ban_yourself">
-		- You cannot ban yourself from a group.
-	</panel.string>
+    - You cannot ban yourself from a group.
+  </panel.string>
   <text
    type="string"
    length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index ea619e6319..dac4371a38 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -304,6 +304,10 @@ clicking on their names.
        name="help_text">
         Any resident on the ban list will be unable to join the group.
       </panel.string>
+      <panel.string
+       name="ban_count_template">
+        Ban count: [COUNT]/[LIMIT]
+      </panel.string>
       <name_list
            column_padding="0"
            draw_heading="true"
@@ -355,6 +359,15 @@ clicking on their names.
         name="ban_refresh"
         tool_tip="Refresh the ban list"
         />
+      <text
+        type="string"
+        height="18"
+        left_pad="5"
+        follows="top|left"
+        layout="topleft"
+        name="ban_count"
+        width="100">
+      </text>
     </panel>
   </tab_container>
   <panel
-- 
cgit v1.2.3