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.

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

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

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">
-- 
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/default/xui/en/role_actions.xml')

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 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/default/xui/en/role_actions.xml')

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

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

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

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