diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-10-29 14:37:18 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-10-29 14:37:18 -0700 |
| commit | b935d5c62d60f42eac1a42575b2eeaf3ede664f6 (patch) | |
| tree | 2199c2f27901d90cde7d5422a6915ff0cc19d8c7 | |
| parent | 427a33d6108ada1c8ca2e046b87b5d035b0ac877 (diff) | |
- Fixed the allowed_by_all to use all 64 bits
- Changed some text to be more clarifying and to remove temp strings.
| -rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml | 2 | ||||
| -rwxr-xr-x | 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" |