From 4945ae17d3692f089ce6c996f6585a5e5b308e4d Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Thu, 29 Aug 2013 11:36:45 -0700
Subject: Initial commit for GroupBan - Lots of crap isn't working as intended
 yet.

---
 .../skins/default/xui/en/panel_group_bulk_ban.xml  | 78 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_group_invite.xml    |  2 +-
 .../skins/default/xui/en/panel_group_roles.xml     | 73 ++++++++++++++++++++
 .../newview/skins/default/xui/en/role_actions.xml  |  7 ++
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 5 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml

(limited to 'indra/newview/skins')

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
new file mode 100644
index 0000000000..3baed595da
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="330"
+ label="Ban Residents"
+ layout="topleft"
+ left="0"
+ name="bulk_ban_panel"
+ top="330"
+ width="210">
+  <panel.string
+   name="loading">
+    (loading...)
+  </panel.string>
+  <panel.string
+     name="ban_selection_too_large">
+    Group Invitations not sent: too many Residents selected. Group Invitations are limited to 100 per request.
+  </panel.string>
+  <text
+   type="string"
+   length="1"
+   height="54"
+   layout="topleft"
+   left="7"
+   name="help_text"
+   top="28"
+   word_wrap="true"
+   width="200">
+    You can select multiple Residents to ban from your group. Click &apos;Open Resident Chooser&apos; to start.
+  </text>
+  <button
+   height="20"
+   label="Open Resident Chooser"
+   layout="topleft"
+   left_delta="-2"
+   name="add_button"
+   top_delta="44"
+   width="200" />
+  <name_list
+   allow_calling_card_drop="true"
+   column_padding="0"
+   height="174"
+   layout="topleft"
+   left_delta="0"
+   multi_select="true"
+   name="banned_agent_list"
+   tool_tip="Hold the Ctrl key and click Resident names to multi-select"
+   top_pad="4"
+   width="200" />
+  <button
+   height="20"
+   label="Remove Selected from List"
+   layout="topleft"
+   left_delta="0"
+   name="remove_button"
+   tool_tip="Removes the Residents selected above from the ban list"
+   top_pad="4"
+   width="200" />
+  <button
+   height="20"
+   label="BAN THIS SICK FILTH"
+   layout="topleft"
+   left="4"
+   name="ban_button"
+   top_delta="30"
+   width="135" />
+  <button
+   height="20"
+   label="Cancel"
+   layout="topleft"
+   left_pad="2"
+   name="cancel_button"
+   top_delta="0"
+   width="65" />
+  <string
+  name="GroupBulkBan">
+    Group Ban
+  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 124c0596c3..944a496fba 100755
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -88,7 +88,7 @@
      label="Send Invitations"
      layout="topleft"
      left="4"
-     name="ok_button"
+     name="invite_button"
      top="356"
      width="135" />
     <button
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 df91ad8b5e..9817f70ac7 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -114,6 +114,13 @@ clicking on their names.
              left_pad="10"
              name="member_eject"
              width="100" />
+            <button
+             height="23"
+             label="Ban"
+             follows="top|left"
+             left_pad="10"
+             name="member_ban"
+             width="100" />
         </panel>
         <panel
          border="false"
@@ -277,6 +284,72 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="270" />
         </scroll_list>
         </panel>
+        <panel
+         border="false"
+         height="303"
+         label="BANNED AGENTS"
+         layout="topleft"
+         left="0"
+         right="-1"
+         help_topic="roles_banlist_tab"
+         name="banlist_sub_tab"
+         class="panel_group_banlist_subtab"
+         tool_tip="View the banned agents from this group."
+         width="310">
+        <panel.string
+         name="help_text">
+            Any resident on the ban list will be unable to join the group.
+        </panel.string>
+        <filter_editor
+        layout="topleft"
+        top="5"
+        left="5"
+        right="-5"
+        height="22"
+        search_button_visible="false"
+        follows="left|top|right"
+        label="Filter Bans"
+        name="filter_bans" />
+          <name_list
+               column_padding="0"
+               draw_heading="true"
+               height="240"
+               follows="left|top|right"
+               layout="topleft"
+               left="0"
+               right="-1"
+               multi_select="true"
+               name="ban_list"
+               short_names="false"
+               top_pad="5">
+            <name_list.columns
+             label="Resident"
+             name="name"
+             font.name="SANSSERIF_SMALL"
+             font.style="NORMAL"
+           relative_width="0.65" />
+            <name_list.columns
+             label="Date Banned"
+             name="date_banned"
+     relative_width="0.35" />
+          </name_list>
+		  <button
+            follows="top|left"
+             height="23"
+             label="Ban!"
+             layout="topleft"
+             left="3"
+             name="ban_create"
+             width="120" />
+            <button
+             height="23"
+             follows="top|left"
+             label="Unban!"
+             layout="topleft"
+             left_pad="10"
+             name="ban_delete"
+             width="120" />
+      </panel>
     </tab_container>
     <panel
      height="350"
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 89aef57cca..79789fcd7b 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
+  <action_set
+      description="These Abilities include powers to ban and un-ban residents from the group."
+      name="Bans">
+    <action description="Manage ban list."
+            longdescription="Allows the group member to ban / un-ban Residents from this group."
+            name="allow ban" value="49" />
+  </action_set>
 	<action_set
 	     description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
 	     name="Membership">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f7b33b0a4a..aa29a88786 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3672,6 +3672,7 @@ Abuse Report</string>
   <string name="LocalEstimateUSD">US$ [AMOUNT]</string>
 
   <!-- Group Profile roles and powers -->
+  <string name="Group Ban">Group Ban</string>
   <string name="Membership">Membership</string>
   <string name="Roles">Roles</string>
   <string name="Group Identity">Group Identity</string>
-- 
cgit v1.2.3


From bf34eccf9c68f204c41d3daea791e50e87d868db Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Mon, 9 Sep 2013 17:29:33 -0700
Subject: - Start of code cleanup - Added refresh button to ban list panel -
 Added an additional signal to LLNameListCtrl to indicate when the entire name
 cache is complete.

---
 .../skins/default/xui/en/panel_group_roles.xml     | 1251 ++++++++++----------
 1 file changed, 633 insertions(+), 618 deletions(-)

(limited to 'indra/newview/skins')

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 9817f70ac7..70d19de848 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -7,132 +7,132 @@
  top="0"
  name="roles_tab"
  width="304">
-    <panel.string
-     name="default_needs_apply_text">
-        There are unsaved changes
-    </panel.string>
-    <panel.string
-     name="want_apply_text">
-        Do you want to save your changes?
-    </panel.string>
-    <panel.string
-     name="help_text" />
-    <tab_container
-    border="false"
-     follows="left|top|right"
-     height="552"
-     halign="center"
+  <panel.string
+   name="default_needs_apply_text">
+    There are unsaved changes
+  </panel.string>
+  <panel.string
+   name="want_apply_text">
+    Do you want to save your changes?
+  </panel.string>
+  <panel.string
+   name="help_text" />
+  <tab_container
+  border="false"
+   follows="left|top|right"
+   height="552"
+   halign="center"
+   layout="topleft"
+   left="0"
+   right="-1"
+   name="roles_tab_container"
+   tab_position="top"
+   tab_height="22"
+   tab_min_width="90"
+   top="0"
+   width="304">
+    <panel
+     border="false"
+     follows="all"
+     height="303"
+     label="MEMBERS"
      layout="topleft"
      left="0"
      right="-1"
-     name="roles_tab_container"
-     tab_position="top"
-     tab_height="22"
-     tab_min_width="90"
-     top="0"
-     width="304">
-        <panel
-         border="false"
-         follows="all"
-         height="303"
-         label="MEMBERS"
-         layout="topleft"
-         left="0"
-         right="-1"
-         help_topic="roles_members_tab"
-         name="members_sub_tab"
-         tool_tip="Members"
-         class="panel_group_members_subtab">
-            <panel.string
-             name="help_text">
-                You can add or remove Roles assigned to Members.
-Select multiple Members by holding the Ctrl key and
-clicking on their names.
-            </panel.string>
-            <panel.string
-             name="donation_area">
-                [AREA] m²
-            </panel.string>
-            <panel.string
-             name="power_folder_icon" translate="false">
-                Inv_FolderClosed
-            </panel.string>
-            <panel.string
-             name="power_all_have_icon" translate="false">
-                Checkbox_On
-            </panel.string>
-            <panel.string
-             name="power_partial_icon" translate="false">
-                Checkbox_Off
-            </panel.string>
-         <filter_editor
-         layout="topleft"
-         top="5"
-         left="5"
-         right="-5"
-         height="22"
-         search_button_visible="false"
-         follows="left|top|right"
-         label="Filter Members"
-         name="filter_input" />
-            <name_list
-             column_padding="2"
-             draw_heading="true"
-             height="240"
-             follows="left|top|right"
-             layout="topleft"
-             left="0"
-             right="-1"
-             multi_select="true"
-             name="member_list"
-             short_names="false" 
-             top_pad="5">
-                <name_list.columns
-                 label="Member"
-                 name="name"
-               relative_width="0.44" />
-                <name_list.columns
-                 label="Donation"
-                 name="donated"
-         relative_width="0.25" />
-                <name_list.columns
-                 label="Status"
-                 name="online"
-                 relative_width="0.14" />
-            </name_list>
-            <button
-             height="23"
-             follows="top|left"
-             label="Invite"
-             left="5"
-             name="member_invite"
-             width="100" />
-            <button
-             height="23"
-             label="Eject"
-             follows="top|left"
-             left_pad="10"
-             name="member_eject"
-             width="100" />
-            <button
-             height="23"
-             label="Ban"
-             follows="top|left"
-             left_pad="10"
-             name="member_ban"
-             width="100" />
-        </panel>
-        <panel
-         border="false"
-         height="303"
-         label="ROLES"
-         layout="topleft"
-         left="0"
-         right="-1"
-         help_topic="roles_roles_tab"
-         name="roles_sub_tab"
-         class="panel_group_roles_subtab">
-           <!-- <button
+     help_topic="roles_members_tab"
+     name="members_sub_tab"
+     tool_tip="Members"
+     class="panel_group_members_subtab">
+      <panel.string
+       name="help_text">
+        You can add or remove Roles assigned to Members.
+        Select multiple Members by holding the Ctrl key and
+        clicking on their names.
+      </panel.string>
+      <panel.string
+       name="donation_area">
+        [AREA] m²
+      </panel.string>
+      <panel.string
+       name="power_folder_icon" translate="false">
+        Inv_FolderClosed
+      </panel.string>
+      <panel.string
+       name="power_all_have_icon" translate="false">
+        Checkbox_On
+      </panel.string>
+      <panel.string
+       name="power_partial_icon" translate="false">
+        Checkbox_Off
+      </panel.string>
+      <filter_editor
+      layout="topleft"
+      top="5"
+      left="5"
+      right="-5"
+      height="22"
+      search_button_visible="false"
+      follows="left|top|right"
+      label="Filter Members"
+      name="filter_input" />
+      <name_list
+       column_padding="2"
+       draw_heading="true"
+       height="240"
+       follows="left|top|right"
+       layout="topleft"
+       left="0"
+       right="-1"
+       multi_select="true"
+       name="member_list"
+       short_names="false"
+       top_pad="5">
+        <name_list.columns
+         label="Member"
+         name="name"
+       relative_width="0.44" />
+        <name_list.columns
+         label="Donation"
+         name="donated"
+ relative_width="0.25" />
+        <name_list.columns
+         label="Status"
+         name="online"
+         relative_width="0.14" />
+      </name_list>
+      <button
+       height="23"
+       follows="top|left"
+       label="Invite"
+       left="5"
+       name="member_invite"
+       width="100" />
+      <button
+       height="23"
+       label="Eject"
+       follows="top|left"
+       left_pad="10"
+       name="member_eject"
+       width="100" />
+      <button
+       height="23"
+       label="Ban"
+       follows="top|left"
+       left_pad="10"
+       name="member_ban"
+       width="100" />
+    </panel>
+    <panel
+     border="false"
+     height="303"
+     label="ROLES"
+     layout="topleft"
+     left="0"
+     right="-1"
+     help_topic="roles_roles_tab"
+     name="roles_sub_tab"
+     class="panel_group_roles_subtab">
+      <!-- <button
              enabled="false"
              height="20"
              label="Show All"
@@ -141,520 +141,535 @@ clicking on their names.
              right="-5"
              name="show_all_button"
              width="100" />-->
-            <panel.string
-             name="help_text">
-                Roles have a title and an allowed list of Abilities
-that Members can perform. Members can belong to
-one or more Roles. A group can have up to 10 Roles,
-including the Everyone and Owner Roles.
-            </panel.string>
-            <panel.string
-             name="cant_delete_role">
-                The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
-            </panel.string>
-            <panel.string
-             name="power_folder_icon" translate="false">
-                Inv_FolderClosed
-            </panel.string>
-            <panel.string
-             name="power_all_have_icon" translate="false">
-                Checkbox_On
-            </panel.string>
-            <panel.string
-             name="power_partial_icon" translate="false">
-                Checkbox_Off
-            </panel.string>
-         <filter_editor
-         layout="topleft"
-         top="5"
-         left="5"
-         right="-5"
-         height="22"
-         search_button_visible="false"
-         follows="left|top|right"
-         label="Filter Roles"
-         name="filter_input" />
-            <scroll_list
-             column_padding="0"
-             draw_heading="true"
-             draw_stripes="false"
-             heading_height="23"
-             height="132"
-             layout="topleft"
-             search_column="1"
-             left="0"
-             follows="left|top|right"
-             right="-1"
-             name="role_list"
-             top_pad="2"
-             width="310">
-                <scroll_list.columns
-                 label="Role"
-                 name="name"
-               relative_width="0.45"  />
-                <scroll_list.columns
-                 label="Title"
-                 name="title"
-               relative_width="0.45"  />
-                <scroll_list.columns
-                 label="#"
-                 name="members"
-               relative_width="0.15"  />
-            </scroll_list>
-            <button
-            follows="top|left"
-             height="23"
-             label="New Role"
-             layout="topleft"
-             left="0"
-             name="role_create"
-             width="120" />
-            <button
-             height="23"
-             follows="top|left"
-             label="Delete Role"
-             layout="topleft"
-             left_pad="10"
-             name="role_delete"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
-         height="303"
-         label="ABILITIES"
-         layout="topleft"
-         left="0"
-         right="-1"
-         help_topic="roles_actions_tab"
-         name="actions_sub_tab"
-         class="panel_group_actions_subtab"
-         tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
-         width="310">
-            <panel.string
-             name="help_text">
-                Abilities allow Members in Roles to do specific
-things in this group. There&apos;s a broad variety of Abilities.
-            </panel.string>
-            <panel.string
-             name="power_folder_icon" translate="false">
-                Inv_FolderClosed
-            </panel.string>
-            <panel.string
-             name="power_all_have_icon" translate="false">
-                Checkbox_On
-            </panel.string>
-            <panel.string
-             name="power_partial_icon" translate="false">
-                Checkbox_Off
-            </panel.string>
-         <filter_editor
-         layout="topleft"
-         top="5"
-         left="5"
-         right="-5"
-         height="22"
-         search_button_visible="false"
-         follows="left|top|right"
-         label="Filter Abilities"
-         name="filter_input" />
-        <scroll_list
-         column_padding="0"
-         draw_stripes="true"
-         height="200"
-         follows="left|top|right"
-         layout="topleft"
-         left="0"
-         right="-1"
-         name="action_list"
-         search_column="2"
-         tool_tip="Select an Ability to view more details"
-         top_pad="5"
-         width="300">
-            <scroll_list.columns
-             label=""
-             name="icon"
-             width="2" />
-            <scroll_list.columns
-             label=""
-             name="checkbox"
-             width="20" />
-            <scroll_list.columns
-             label=""
-             name="action"
-             width="270" />
-        </scroll_list>
-        </panel>
-        <panel
-         border="false"
-         height="303"
-         label="BANNED AGENTS"
-         layout="topleft"
-         left="0"
-         right="-1"
-         help_topic="roles_banlist_tab"
-         name="banlist_sub_tab"
-         class="panel_group_banlist_subtab"
-         tool_tip="View the banned agents from this group."
-         width="310">
-        <panel.string
-         name="help_text">
-            Any resident on the ban list will be unable to join the group.
-        </panel.string>
-        <filter_editor
-        layout="topleft"
-        top="5"
-        left="5"
-        right="-5"
-        height="22"
-        search_button_visible="false"
-        follows="left|top|right"
-        label="Filter Bans"
-        name="filter_bans" />
-          <name_list
-               column_padding="0"
-               draw_heading="true"
-               height="240"
-               follows="left|top|right"
-               layout="topleft"
-               left="0"
-               right="-1"
-               multi_select="true"
-               name="ban_list"
-               short_names="false"
-               top_pad="5">
-            <name_list.columns
-             label="Resident"
-             name="name"
-             font.name="SANSSERIF_SMALL"
-             font.style="NORMAL"
-           relative_width="0.65" />
-            <name_list.columns
-             label="Date Banned"
-             name="date_banned"
-     relative_width="0.35" />
-          </name_list>
-		  <button
-            follows="top|left"
-             height="23"
-             label="Ban!"
-             layout="topleft"
-             left="3"
-             name="ban_create"
-             width="120" />
-            <button
-             height="23"
-             follows="top|left"
-             label="Unban!"
-             layout="topleft"
-             left_pad="10"
-             name="ban_delete"
-             width="120" />
-      </panel>
-    </tab_container>
+      <panel.string
+       name="help_text">
+        Roles have a title and an allowed list of Abilities
+        that Members can perform. Members can belong to
+        one or more Roles. A group can have up to 10 Roles,
+        including the Everyone and Owner Roles.
+      </panel.string>
+      <panel.string
+       name="cant_delete_role">
+        The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
+      </panel.string>
+      <panel.string
+       name="power_folder_icon" translate="false">
+        Inv_FolderClosed
+      </panel.string>
+      <panel.string
+       name="power_all_have_icon" translate="false">
+        Checkbox_On
+      </panel.string>
+      <panel.string
+       name="power_partial_icon" translate="false">
+        Checkbox_Off
+      </panel.string>
+      <filter_editor
+      layout="topleft"
+      top="5"
+      left="5"
+      right="-5"
+      height="22"
+      search_button_visible="false"
+      follows="left|top|right"
+      label="Filter Roles"
+      name="filter_input" />
+      <scroll_list
+       column_padding="0"
+       draw_heading="true"
+       draw_stripes="false"
+       heading_height="23"
+       height="132"
+       layout="topleft"
+       search_column="1"
+       left="0"
+       follows="left|top|right"
+       right="-1"
+       name="role_list"
+       top_pad="2"
+       width="310">
+        <scroll_list.columns
+         label="Role"
+         name="name"
+       relative_width="0.45"  />
+        <scroll_list.columns
+         label="Title"
+         name="title"
+       relative_width="0.45"  />
+        <scroll_list.columns
+         label="#"
+         name="members"
+       relative_width="0.15"  />
+      </scroll_list>
+      <button
+      follows="top|left"
+       height="23"
+       label="New Role"
+       layout="topleft"
+       left="0"
+       name="role_create"
+       width="120" />
+      <button
+       height="23"
+       follows="top|left"
+       label="Delete Role"
+       layout="topleft"
+       left_pad="10"
+       name="role_delete"
+       width="120" />
+    </panel>
     <panel
-     height="350"
-     background_visible="false"
-     bg_alpha_color="FloaterUnfocusBorderColor"
+     border="false"
+     height="303"
+     label="ABILITIES"
      layout="topleft"
-     follows="top|left|right"
      left="0"
      right="-1"
-     width="313"
-     mouse_opaque="false"
-     name="members_footer"
-     top="325"
-     visible="false">
-        <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         top="8"
-         text_color="EmphasisColor"
-         name="static"
-         width="300">
-            Assigned Roles
-        </text>
-        <scroll_list
-         draw_stripes="true"
-        follows="left|top|right"
-         height="150"
-         layout="topleft"
-         left="0"
-         right="-1"
-         name="member_assigned_roles"
-         top_pad="0">
-            <scroll_list.columns
-             label=""
-             name="checkbox"
-             width="20" />
-            <scroll_list.columns
-             label=""
-             name="role"
-             width="270" />
-        </scroll_list>
-          <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         top_pad="5"
-         text_color="EmphasisColor"
-         name="static2"
-         width="285">
-            Allowed Abilities
-        </text>
-        <scroll_list
-         draw_stripes="true"
-             follows="left|top|right"
-         height="150"
-         layout="topleft"
-         left="0"
-         right="-1"
-         name="member_allowed_actions"
-         search_column="2"
-         tool_tip="For details of each allowed ability see the abilities tab"
-         top_pad="0">
-            <scroll_list.columns
-             label=""
-             name="icon"
-             width="2" />
-            <scroll_list.columns
-             label=""
-             name="checkbox"
-             width="20" />
-            <scroll_list.columns
-             label=""
-             name="action"
-             width="270" />
-        </scroll_list>
+     help_topic="roles_actions_tab"
+     name="actions_sub_tab"
+     class="panel_group_actions_subtab"
+     tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
+     width="310">
+      <panel.string
+       name="help_text">
+        Abilities allow Members in Roles to do specific
+        things in this group. There&apos;s a broad variety of Abilities.
+      </panel.string>
+      <panel.string
+       name="power_folder_icon" translate="false">
+        Inv_FolderClosed
+      </panel.string>
+      <panel.string
+       name="power_all_have_icon" translate="false">
+        Checkbox_On
+      </panel.string>
+      <panel.string
+       name="power_partial_icon" translate="false">
+        Checkbox_Off
+      </panel.string>
+      <filter_editor
+      layout="topleft"
+      top="5"
+      left="5"
+      right="-5"
+      height="22"
+      search_button_visible="false"
+      follows="left|top|right"
+      label="Filter Abilities"
+      name="filter_input" />
+      <scroll_list
+       column_padding="0"
+       draw_stripes="true"
+       height="200"
+       follows="left|top|right"
+       layout="topleft"
+       left="0"
+       right="-1"
+       name="action_list"
+       search_column="2"
+       tool_tip="Select an Ability to view more details"
+       top_pad="5"
+       width="300">
+        <scroll_list.columns
+         label=""
+         name="icon"
+         width="2" />
+        <scroll_list.columns
+         label=""
+         name="checkbox"
+         width="20" />
+        <scroll_list.columns
+         label=""
+         name="action"
+         width="270" />
+      </scroll_list>
     </panel>
     <panel
-     height="550"
-     background_visible="false"
-     bg_alpha_color="FloaterUnfocusBorderColor"
+     border="false"
+     height="303"
+     label="BANNED AGENTS"
      layout="topleft"
-     follows="top|left|right"
      left="0"
      right="-1"
-     width="313"
-     mouse_opaque="false"
-     name="roles_footer"
-     top_delta="0"
-     top="209"
-     visible="false">
-        <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         top="5"
-         name="static"
-         width="300">
-           Role Name
-        </text>
-        <line_editor
-         type="string"
-         height="20"
-         layout="topleft"
-         left="0"
-         follows="left|top|right"
-         right="-1"
-         max_length_bytes="20"
-         name="role_name"
-         top_pad="0"
-         width="300">
-        </line_editor>
-        <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         name="static3"
-         top_pad="5"
-         width="300">
-           Role Title
-        </text>
-        <line_editor
-         type="string"
-         height="20"
-         layout="topleft"
-         left="0"
-         follows="left|top|right"
-         right="-1"
-         max_length_bytes="20"
-         name="role_title"
-         top_pad="0"
-         width="300">
-        </line_editor>
-               <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         name="static2"
-         top_pad="5"
-         width="200">
-            Description
-        </text>
-        <text_editor
-         type="string"
-         layout="topleft"
-         left="0"
-         follows="left|top|right"
-         right="-1"
-         max_length="295"
-         height="35"
-         name="role_description"
-         top_pad="0"
-         width="300"
-         word_wrap="true">
-        </text_editor>
-        <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         text_color="EmphasisColor"
-         name="static4"
-         top_pad="5"
-         width="300">
-            Assigned Members
-        </text>
-        <name_list
-         draw_stripes="true"
-         height="128"
-         layout="topleft"
-         left="0"
-         follows="left|top|right"
-         right="-1"
-         name="role_assigned_members"
-         top_pad="0"
-         width="300" />
-        <check_box
-         height="15"
-         label="Reveal members"
-         left="5"
-         layout="topleft"
-         name="role_visible_in_list"
-         tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
-         top_pad="4"
-         width="300" />
-         <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         text_color="EmphasisColor"
-         name="static5"
-         top_pad="2"
-         width="300">
-            Allowed Abilities
-        </text>
-        <scroll_list
-         draw_stripes="true"
-         height="140"
-         layout="topleft"
-         left="0"
-         follows="left|top|right"
-         right="-1"
-         name="role_allowed_actions"
-         search_column="2"
-         tool_tip="For details of each allowed ability see the abilities tab"
-         top_pad="0"
-         width="300">
-            <scroll_list.columns
-             label=""
-             name="icon"
-             width="2" />
-            <scroll_list.columns
-             label=""
-             name="checkbox"
-             width="20" />
-            <scroll_list.columns
-             label=""
-             name="action"
-             width="270" />
-        </scroll_list>
+     help_topic="roles_banlist_tab"
+     name="banlist_sub_tab"
+     class="panel_group_banlist_subtab"
+     tool_tip="View the banned agents from this group."
+     width="310">
+      <panel.string
+       name="help_text">
+        Any resident on the ban list will be unable to join the group.
+      </panel.string>
+      <filter_editor
+      layout="topleft"
+      top="5"
+      left="5"
+      right="-5"
+      height="22"
+      search_button_visible="false"
+      follows="left|top|right"
+      label="Filter Bans"
+      name="filter_bans" />
+      <name_list
+           column_padding="0"
+           draw_heading="true"
+           height="400"
+           follows="left|top|right"
+           layout="topleft"
+           left="0"
+           right="-1"
+           multi_select="true"
+           name="ban_list"
+           short_names="false"
+           top_pad="5">
+        <name_list.columns
+         label="Resident"
+         name="name"
+         font.name="SANSSERIF_SMALL"
+         font.style="NORMAL"
+       relative_width="0.4" />
+        <name_list.columns
+         label="Date Banned"
+         name="ban_date"
+         relative_width="0.3" />
+        <name_list.columns
+          label="Reason"
+          name="ban_reason" />
+      </name_list>
+      <button
+        follows="top|left"
+        height="23"
+        label="Ban!"
+        layout="topleft"
+        left="3"
+        name="ban_create"
+        tool_tip="Ban residents from your group"
+        width="120" />
+      <button
+        follows="top|left"
+        height="23"
+        label="Unban!"
+        layout="topleft"
+        left_pad="5"
+        name="ban_delete"
+        tool_tip="Unban selected residents from your group"
+        width="120" />
+      <button
+        follows="top|left"
+        height="23"
+        width="23"
+        image_overlay="Refresh_Off"
+        layout="topleft"
+        left_pad="5"
+        name="ban_refresh"
+        tool_tip="Refresh the ban list"
+        />
     </panel>
-   <panel
-     height="424"
-     background_visible="false"
-     bg_alpha_color="FloaterUnfocusBorderColor"
+  </tab_container>
+  <panel
+   height="350"
+   background_visible="false"
+   bg_alpha_color="FloaterUnfocusBorderColor"
+   layout="topleft"
+   follows="top|left|right"
+   left="0"
+   right="-1"
+   width="313"
+   mouse_opaque="false"
+   name="members_footer"
+   top="325"
+   visible="false">
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     top="8"
+     text_color="EmphasisColor"
+     name="static"
+     width="300">
+      Assigned Roles
+    </text>
+    <scroll_list
+     draw_stripes="true"
+    follows="left|top|right"
+     height="150"
      layout="topleft"
-     follows="top|left|right"
      left="0"
      right="-1"
-     width="313"
-     mouse_opaque="false"
-     name="actions_footer"
-     top_delta="0"
-     top="255"
-     visible="false">
-        <text_editor
-       bg_readonly_color="Transparent"
-       text_readonly_color="EmphasisColor"
-       font="SansSerifSmall"
-         type="string"
-         enabled="false"
-         halign="left"
-         layout="topleft"
+     name="member_assigned_roles"
+     top_pad="0">
+      <scroll_list.columns
+       label=""
+       name="checkbox"
+       width="20" />
+      <scroll_list.columns
+       label=""
+       name="role"
+       width="270" />
+    </scroll_list>
+    <text
+   type="string"
+   height="16"
+   layout="topleft"
+   follows="left|top"
+   left="5"
+   top_pad="5"
+   text_color="EmphasisColor"
+   name="static2"
+   width="285">
+      Allowed Abilities
+    </text>
+    <scroll_list
+     draw_stripes="true"
          follows="left|top|right"
-         left="0"
-         right="-1"
-         height="90"
-         max_length="512"
-         name="action_description"
-         top="0"
-         word_wrap="true">
-            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-        </text_editor>
-        <text
+     height="150"
+     layout="topleft"
+     left="0"
+     right="-1"
+     name="member_allowed_actions"
+     search_column="2"
+     tool_tip="For details of each allowed ability see the abilities tab"
+     top_pad="0">
+      <scroll_list.columns
+       label=""
+       name="icon"
+       width="2" />
+      <scroll_list.columns
+       label=""
+       name="checkbox"
+       width="20" />
+      <scroll_list.columns
+       label=""
+       name="action"
+       width="270" />
+    </scroll_list>
+  </panel>
+  <panel
+   height="550"
+   background_visible="false"
+   bg_alpha_color="FloaterUnfocusBorderColor"
+   layout="topleft"
+   follows="top|left|right"
+   left="0"
+   right="-1"
+   width="313"
+   mouse_opaque="false"
+   name="roles_footer"
+   top_delta="0"
+   top="209"
+   visible="false">
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     top="5"
+     name="static"
+     width="300">
+      Role Name
+    </text>
+    <line_editor
+     type="string"
+     height="20"
+     layout="topleft"
+     left="0"
+     follows="left|top|right"
+     right="-1"
+     max_length_bytes="20"
+     name="role_name"
+     top_pad="0"
+     width="300">
+    </line_editor>
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     name="static3"
+     top_pad="5"
+     width="300">
+      Role Title
+    </text>
+    <line_editor
+     type="string"
+     height="20"
+     layout="topleft"
+     left="0"
+     follows="left|top|right"
+     right="-1"
+     max_length_bytes="20"
+     name="role_title"
+     top_pad="0"
+     width="300">
+    </line_editor>
+    <text
          type="string"
          height="16"
          layout="topleft"
          follows="left|top"
          left="5"
          name="static2"
-         top_pad="1"
-         width="300">
-            Roles with this ability
-        </text>
-        <scroll_list
-         height="172"
-         layout="topleft"
-         follows="left|top|right"
-         left="5"
-         right="-1"
-         name="action_roles"
-         top_pad="0"
-         width="300" />
-        <text
-         type="string"
-         height="16"
-         layout="topleft"
-         follows="left|top"
-         left="5"
-         name="static3"
          top_pad="5"
-         width="300">
-            Members with this ability
-        </text>
-        <name_list
-         height="122"
-         follows="left|top|right"
-         layout="topleft"
-         left="5"
-         right="-1"
-         name="action_members"
-         top_pad="0"
-         width="300" />
-    </panel>
+         width="200">
+      Description
+    </text>
+    <text_editor
+     type="string"
+     layout="topleft"
+     left="0"
+     follows="left|top|right"
+     right="-1"
+     max_length="295"
+     height="35"
+     name="role_description"
+     top_pad="0"
+     width="300"
+     word_wrap="true">
+    </text_editor>
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     text_color="EmphasisColor"
+     name="static4"
+     top_pad="5"
+     width="300">
+      Assigned Members
+    </text>
+    <name_list
+     draw_stripes="true"
+     height="128"
+     layout="topleft"
+     left="0"
+     follows="left|top|right"
+     right="-1"
+     name="role_assigned_members"
+     top_pad="0"
+     width="300" />
+    <check_box
+     height="15"
+     label="Reveal members"
+     left="5"
+     layout="topleft"
+     name="role_visible_in_list"
+     tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
+     top_pad="4"
+     width="300" />
+    <text
+    type="string"
+    height="16"
+    layout="topleft"
+    follows="left|top"
+    left="5"
+    text_color="EmphasisColor"
+    name="static5"
+    top_pad="2"
+    width="300">
+      Allowed Abilities
+    </text>
+    <scroll_list
+     draw_stripes="true"
+     height="140"
+     layout="topleft"
+     left="0"
+     follows="left|top|right"
+     right="-1"
+     name="role_allowed_actions"
+     search_column="2"
+     tool_tip="For details of each allowed ability see the abilities tab"
+     top_pad="0"
+     width="300">
+      <scroll_list.columns
+       label=""
+       name="icon"
+       width="2" />
+      <scroll_list.columns
+       label=""
+       name="checkbox"
+       width="20" />
+      <scroll_list.columns
+       label=""
+       name="action"
+       width="270" />
+    </scroll_list>
+  </panel>
+  <panel
+    height="424"
+    background_visible="false"
+    bg_alpha_color="FloaterUnfocusBorderColor"
+    layout="topleft"
+    follows="top|left|right"
+    left="0"
+    right="-1"
+    width="313"
+    mouse_opaque="false"
+    name="actions_footer"
+    top_delta="0"
+    top="255"
+    visible="false">
+    <text_editor
+   bg_readonly_color="Transparent"
+   text_readonly_color="EmphasisColor"
+   font="SansSerifSmall"
+     type="string"
+     enabled="false"
+     halign="left"
+     layout="topleft"
+     follows="left|top|right"
+     left="0"
+     right="-1"
+     height="90"
+     max_length="512"
+     name="action_description"
+     top="0"
+     word_wrap="true">
+      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+    </text_editor>
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     name="static2"
+     top_pad="1"
+     width="300">
+      Roles with this ability
+    </text>
+    <scroll_list
+     height="172"
+     layout="topleft"
+     follows="left|top|right"
+     left="5"
+     right="-1"
+     name="action_roles"
+     top_pad="0"
+     width="300" />
+    <text
+     type="string"
+     height="16"
+     layout="topleft"
+     follows="left|top"
+     left="5"
+     name="static3"
+     top_pad="5"
+     width="300">
+      Members with this ability
+    </text>
+    <name_list
+     height="122"
+     follows="left|top|right"
+     layout="topleft"
+     left="5"
+     right="-1"
+     name="action_members"
+     top_pad="0"
+     width="300" />
+  </panel>
 </panel>
-- 
cgit v1.2.3


From 34f561db55868185f0a946009f41f4f212366484 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Fri, 13 Sep 2013 17:20:04 -0700
Subject: - Added ban date to ban list ui - Code cleanup

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

(limited to 'indra/newview/skins')

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 70d19de848..15ddc8f313 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -327,14 +327,11 @@
          name="name"
          font.name="SANSSERIF_SMALL"
          font.style="NORMAL"
-       relative_width="0.4" />
+         relative_width="0.7" />
         <name_list.columns
          label="Date Banned"
          name="ban_date"
          relative_width="0.3" />
-        <name_list.columns
-          label="Reason"
-          name="ban_reason" />
       </name_list>
       <button
         follows="top|left"
-- 
cgit v1.2.3


From 427a33d6108ada1c8ca2e046b87b5d035b0ac877 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Wed, 9 Oct 2013 17:03:24 -0700
Subject: [GroupBan] Minor fixes / Code review Reviewer: Richard Linden - Minor
 fixes from code review - Continue stubbing out ban_reason, or implement it
 (depending on how quickly I can do it, though stubbing out ban_reason will be
 sufficient, which it is now) - Fixed an issue where a ban list string in the
 actions tab wasn't showing up properly

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 7459fdae98..0c8a043ea7 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -2,8 +2,8 @@
 <role_actions>
   <action_set
       description="These Abilities include powers to ban and un-ban residents from the group."
-      name="Bans">
-    <action description="Manage ban list."
+      name="Group Ban">
+    <action description="Manage ban list"
             longdescription="Allows the group member to ban / un-ban Residents from this group."
             name="allow ban" value="49" />
   </action_set>
-- 
cgit v1.2.3


From b935d5c62d60f42eac1a42575b2eeaf3ede664f6 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Tue, 29 Oct 2013 14:37:18 -0700
Subject: - Fixed the allowed_by_all to use all 64 bits - Changed some text to
 be more clarifying and to remove temp strings.

---
 indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_group_roles.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

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 3baed595da..bdea79f79d 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
@@ -57,7 +57,7 @@
    width="200" />
   <button
    height="20"
-   label="BAN THIS SICK FILTH"
+   label="Ban Residents"
    layout="topleft"
    left="4"
    name="ban_button"
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 15ddc8f313..9c3dddf476 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -116,7 +116,7 @@
        width="100" />
       <button
        height="23"
-       label="Ban"
+       label="Ban Member(s)"
        follows="top|left"
        left_pad="10"
        name="member_ban"
@@ -336,7 +336,7 @@
       <button
         follows="top|left"
         height="23"
-        label="Ban!"
+        label="Ban Resident(s)"
         layout="topleft"
         left="3"
         name="ban_create"
@@ -345,7 +345,7 @@
       <button
         follows="top|left"
         height="23"
-        label="Unban!"
+        label="Remove Ban(s)"
         layout="topleft"
         left_pad="5"
         name="ban_delete"
-- 
cgit v1.2.3


From 74707f0057c05dc4dd439302e64fe29e8ed91a32 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Wed, 6 Nov 2013 16:14:32 -0800
Subject: - Fixed an issue where the role action value was not equal to the
 constant in roles_constants.h

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 0c8a043ea7..490217d3f6 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -5,7 +5,7 @@
       name="Group Ban">
     <action description="Manage ban list"
             longdescription="Allows the group member to ban / un-ban Residents from this group."
-            name="allow ban" value="49" />
+            name="allow ban" value="51" />
   </action_set>
 	<action_set
 	     description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
-- 
cgit v1.2.3


From 25d0a3e029cb68a14cc7c3417cc43cb3ffa90925 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Thu, 6 Feb 2014 16:19:03 -0800
Subject: [GroupBan] When adding "Manage Ban List" ability additionally grant
 requisite abilities - Viewer side implementation for MAINT-3467 complete

---
 .../newview/skins/default/xui/en/notifications.xml | 30 +++++++++++++++++++++-
 .../newview/skins/default/xui/en/role_actions.xml  | 12 +++------
 2 files changed, 33 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 35f2e7b31e..ccd2113292 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -506,7 +506,35 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
-  
+
+  <notification
+    icon="alertmodal.tga"
+    name="AssignBanAbilityWarning"
+    type="alertmodal">
+You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+Any Member in a Role with this Ability will also be granted the Abilities &apos;[ACTION_NAME_2]&apos; and &apos;[ACTION_NAME_3]&apos;
+    <usetemplate
+      name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+  icon="alertmodal.tga"
+  name="RemoveBanAbilityWarning"
+  type="alertmodal">
+You are removing the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+Removing this ability will NOT remove the Abilities &apos;[ACTION_NAME_2]&apos; and &apos;[ACTION_NAME_3]&apos;.
+ 
+If you no longer wish to have these abilities granted to this role, disable them immediately!
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
     icon="alertmodal.tga"
     name="EjectGroupMemberWarning"
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 490217d3f6..1044cbfd2e 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
-  <action_set
-      description="These Abilities include powers to ban and un-ban residents from the group."
-      name="Group Ban">
-    <action description="Manage ban list"
-            longdescription="Allows the group member to ban / un-ban Residents from this group."
-            name="allow ban" value="51" />
-  </action_set>
 	<action_set
 	     description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
 	     name="Membership">
@@ -16,7 +9,10 @@
 		<action description="Eject Members from this Group"
 		     longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
 		     name="member eject" value="2" />
-		<action
+    <action description="Manage ban list"
+         longdescription="Allows the group member to ban / un-ban Residents from this group."
+         name="allow ban" value="51" />
+    <action
 		     description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;"
 		     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section."
 		     name="member options" value="3" />
-- 
cgit v1.2.3


From 910b40c12062181fd6d5d82d169c29632c95c830 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Wed, 5 Mar 2014 10:15:41 -0800
Subject: [MAINT-3385] Filter function of Banned Agents doesn't work - Removed
 filter

---
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins')

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 9c3dddf476..783106b887 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -300,16 +300,6 @@
        name="help_text">
         Any resident on the ban list will be unable to join the group.
       </panel.string>
-      <filter_editor
-      layout="topleft"
-      top="5"
-      left="5"
-      right="-5"
-      height="22"
-      search_button_visible="false"
-      follows="left|top|right"
-      label="Filter Bans"
-      name="filter_bans" />
       <name_list
            column_padding="0"
            draw_heading="true"
-- 
cgit v1.2.3


From aef1cc0576c4bf1e7248f1008a1582771845c59f Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Tue, 25 Mar 2014 16:21:07 -0700
Subject: [GroupBan] - Fixed stuff... again - Put "Ban Members" button back in
 Member tab

Reviewer: Richard
---
 indra/newview/skins/default/xui/en/floater_about.xml     | 2 +-
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 9668cfa526..ef2f158a86 100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -72,7 +72,7 @@ Second Life is brought to you by the Lindens:
        top_pad="10"
        width="435"
        word_wrap="true">
-Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase, Baker
       </text_editor>
       <text
           follows="top|left"
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 1965b3c7f9..bcce549b60 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -118,6 +118,13 @@ clicking on their names.
              left_pad="10"
              name="member_eject"
              width="100" />
+      <button
+       height="23"
+       label="Ban Member(s)"
+       follows="top|left"
+       left_pad="10"
+       name="member_ban"
+       width="100" />
         </panel>
         <panel
          border="false"
-- 
cgit v1.2.3


From 1ca5dd40765211dc993393caa0003cfa7505c1f5 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Tue, 8 Apr 2014 16:34:49 -0700
Subject: [GroupBan] [MAINT-3722] - Banning from 'banned agents' tab does not
 eject them from the group - Banning a resident from the "Banned Agents" tab
 should not properly eject them from the group. - Renamed "Banned Agents" to
 "Banned Residents".  Updated tool tip as well. - You should now receive an
 eject notification when banning an agent from the "Banned Residents" tab.

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

(limited to 'indra/newview/skins')

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 bcce549b60..ea619e6319 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -291,14 +291,14 @@ clicking on their names.
     <panel
      border="false"
      height="303"
-     label="BANNED AGENTS"
+     label="BANNED RESIDENTS"
      layout="topleft"
      left="0"
      right="-1"
      help_topic="roles_banlist_tab"
      name="banlist_sub_tab"
      class="panel_group_banlist_subtab"
-     tool_tip="View the banned agents from this group."
+     tool_tip="View the banned residents from this group."
      width="310">
       <panel.string
        name="help_text">
-- 
cgit v1.2.3


From bfc274741ad97a2885a26ae35108e158aeb9525e Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Tue, 6 May 2014 11:01:59 -0700
Subject: [MAINT-3834] Banning more than 100 residents causes multiple floaters
 - Removed superfluous floater dialogs from displaying

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

(limited to 'indra/newview/skins')

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 bdea79f79d..8dd2719926 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
@@ -13,7 +13,7 @@
   </panel.string>
   <panel.string
      name="ban_selection_too_large">
-    Group Invitations not sent: too many Residents selected. Group Invitations are limited to 100 per request.
+    Group bans not sent: too many Residents selected. Group bans are limited to 100 per request.
   </panel.string>
   <text
    type="string"
-- 
cgit v1.2.3


From 8e3080dc7b8d494ea3f062f6026a39b05b94ebef Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 23 May 2014 22:08:56 +0300
Subject: MAINT-4016 FIXED Viewer attempts full fetch of member list before
 allowing user to leave group: added two notifications GroupDepartError and
 GroupDepart

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 19d7cd104a..b6f7faa988 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3774,6 +3774,28 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="aler.tga"
+   name="GroupDepartError"
+   type="alert">
+Unable to leave this group.
+      <tag>reason</tag>
+      <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="GroupDepart"
+   type="alert">
+You have left the group [group_name].
+      <tag>group_name</tag>
+      <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    name="ConfirmKick"
-- 
cgit v1.2.3


From 15765ef66589adde597c4614427742c1c7ebf7c5 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Sat, 24 May 2014 03:10:07 +0300
Subject: MAINT-4016 FIXED Viewer attempts full fetch of member list before
 allowing user to leave group: updating of text for GroupDepartError
 notifications.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b6f7faa988..1f1dd4b522 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3778,7 +3778,7 @@ Leave Group?
    icon="aler.tga"
    name="GroupDepartError"
    type="alert">
-Unable to leave this group.
+Unable to leave group: [reason].
       <tag>reason</tag>
       <usetemplate
        name="okbutton"
-- 
cgit v1.2.3


From a0b31c3145b25c1267954dd42d2afa916e5fa046 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 6 Jun 2014 07:41:01 +0300
Subject: MAINT-3389 FIXED [vwr] No visual feedback if you try to ban an
 already banned agent.

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

(limited to 'indra/newview/skins')

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 8dd2719926..43449df1fd 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,6 +15,10 @@
      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
+     name="already_banned">
+    Group Invitations not sent: resident '[RESIDENT]' already banned.
+  </panel.string>
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


From 2834c7968de9efc81d3c7db8a9c2b5cd2f16d6a3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 29 Apr 2014 14:24:00 -0700
Subject: MAINT-3975 FIX Group Invitation window omits ? button for listed
 residents (INTEREST LIST RC only)

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 124c0596c3..f47ed992ca 100755
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -76,7 +76,7 @@
         Choose what Role to assign them to:
     </text>
     <combo_box
-     height="16"
+     height="20"
      layout="topleft"
      left_delta="0"
      name="role_name"
-- 
cgit v1.2.3


From f924175da0acbb8a8884fff0740d416da9c2489c Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Wed, 18 Jun 2014 13:00:18 +0300
Subject: MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in
 multiselection

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 31b1d091ee..f5a493c064 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -17,6 +17,7 @@
      layout="topleft"
      name="open_voice_conversation">
         <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_open_voice_conversation"/>
      </menu_item_call>	
      <menu_item_call
      label="Disconnect from voice"
-- 
cgit v1.2.3


From be2f4ecdb4135256e3e513370614c1626e5a1354 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 23 Jun 2014 18:39:53 +0300
Subject: MAINT-4175 FIXED [Group Bans] When banning a list of multiple
 avatars, if an already banned avatar is included in the list, no avatars are
 added to the ban list and those avatars already group members are not ejected
 from the group.

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

(limited to 'indra/newview/skins')

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 43449df1fd..31989f2e16 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,10 +15,28 @@
      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
-     name="already_banned">
-    Group Invitations not sent: resident '[RESIDENT]' already banned.
-  </panel.string>
+	<panel.string
+     name="ban_not_permitted">
+		Group ban not sent: you do not have 'Manage ban list' ability.
+	</panel.string>
+	<panel.string
+     name="partial_ban">
+		Some group bans were not sent:
+[REASONS]
+	</panel.string>
+	<panel.string
+     name="ban_failed">
+		Group bans were not sent:
+[REASONS]
+	</panel.string>
+	<panel.string
+     name="residents_already_banned">
+		- The following resident(s) are already banned: [RESIDENTS].
+	</panel.string>
+	<panel.string
+     name="cant_ban_yourself">
+		- You cannot ban yourself from a group.
+	</panel.string>
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


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')

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


From b4df05d21af49ab7195b77d44fb0e53b070e79bd Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 14 Jul 2014 12:31:16 +0300
Subject: MAINT-4226 Group ban option is added to participant menu in Group
 chat.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index f5a493c064..ed362b36e5 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -214,4 +214,12 @@
 			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
 		</menu_item_call>
 	</context_menu>
+	<menu_item_separator layout="topleft" name="Group Ban Separator"/>
+	<menu_item_call
+		 label="Ban member"
+		 layout="topleft"
+		 name="BanMember">
+			<on_click function="Avatar.DoToSelected" parameter="ban_member" />
+			<on_enable function="Avatar.EnableItem" parameter="can_ban_member" />
+	</menu_item_call>		
 </toggleable_menu>
-- 
cgit v1.2.3