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/llpanelgrouproles.cpp                         | 2 +-
 indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_group_roles.xml    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 0be7ee7d05..347d2135b1 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -872,7 +872,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 
 	// Build a vector of all selected members, and gather allowed actions.
 	uuid_vec_t selected_members;
-	U64 allowed_by_all = 0xffffffffffffLL;
+	U64 allowed_by_all = 0xFFFFffffFFFFffffLL;
 	U64 allowed_by_some = 0;
 
 	std::vector<LLScrollListItem*>::iterator itor;
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