Pull merge from lindenlab/viewer-release

8 files changed, 693 insertions, 434 deletions

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/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 31b1d091ee..ed362b36e5 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"
@@ -213,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>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 062a93f3cf..02009e63e0 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -589,7 +589,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"
@@ -3830,6 +3858,28 @@ Leave Group?
   </notification>
 
   <notification
+   icon="aler.tga"
+   name="GroupDepartError"
+   type="alert">
+Unable to leave group: [reason].
+      <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"
    type="alert">
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..509dcf354e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -0,0 +1,108 @@
+<?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 bans not sent: too many Residents selected. Group bans are limited to 100 per request.
+  </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="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:
+[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="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>
+  <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 Residents"
+   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..ebb460deb0 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"
@@ -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 9ac5b8800e..dac4371a38 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"
@@ -138,454 +145,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>
-    </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 RESIDENTS"
      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 residents 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>
+      <panel.string
+       name="ban_count_template">
+        Ban count: [COUNT]/[LIMIT]
+      </panel.string>
+      <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.7" />
+        <name_list.columns
+         label="Date Banned"
+         name="ban_date"
+         relative_width="0.3" />
+      </name_list>
+      <button
+        follows="top|left"
+        height="23"
+        label="Ban Resident(s)"
+        layout="topleft"
+        left="3"
+        name="ban_create"
+        tool_tip="Ban residents from your group"
+        width="120" />
+      <button
+        follows="top|left"
+        height="23"
+        label="Remove Ban(s)"
+        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"
+        />
+      <text
+        type="string"
+        height="18"
+        left_pad="5"
+        follows="top|left"
+        layout="topleft"
+        name="ban_count"
+        width="100">
+      </text>
     </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>
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 0eeccbeac5..1044cbfd2e 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -9,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" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3cf8ffae26..5fb964fba7 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3796,6 +3796,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>