Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group Bans!

Browse Source 
Thankies Baker Linden~

Ported Ansariel's mAvatarNameCacheConnection change to mAvatarNameCacheConnections to llpanelgroupbulkimpl.h

Adds setGroupID in places, in case we ever want to add that.. but for now we don't really need/use it
Adds Refresh_Off icon from upstream.

Viewer Interesting changes:
Moves LLGroupChange out of stdenums.h into llgroupmgr.h
Moves roles_constants.h from llcommon into newview

This looks like it's better without space changes...
This commit is contained in:
Inusaito Sayori
2014-06-21 16:44:39 -04:00
parent b36bb8b5bb
commit d87a48ea06
30 changed files with 2143 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/Refresh_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 483 B

1
indra/newview/skins/default/textures/textures.xml
View File

@@ -415,4 +415,5 @@
<texture name="Inv_WindLight.png" preload="true"/>
<texture name="Inv_WaterLight.png" preload="true"/>
<texture name="Refresh_Off" file_name="Refresh_Off.png" preload="true" />
</textures>

50
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -612,6 +612,34 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
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="AttachmentDrop"
@@ -3333,6 +3361,28 @@ Leave Group?
yestext="OK"/>
</notification>
<notification
icon="alert.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"

86
indra/newview/skins/default/xui/en-us/panel_group_bulk_ban.xml Normal file
View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
height="270"
label="Ban Residents"
layout="topleft"
left="0"
name="bulk_ban_panel"
mouse_opaque="false"
bottom="0"
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="already_banned">
Group Invitations not sent: resident '[RESIDENT]' already banned.
</panel.string>
<text
type="string"
length="1"
height="54"
bottom="-28"
layout="topleft"
left="7"
name="help_text"
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"
bottom_delta="-10"
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"
menu_num="0"
bottom_delta="-178"
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"
bottom_delta="-24"
width="200" />
<button
height="20"
label="Ban Residents"
layout="topleft"
left="4"
name="ban_button"
bottom_delta="-26"
width="135" />
<button
height="20"
label="Cancel"
layout="topleft"
left_delta="137"
name="cancel_button"
bottom_delta="0"
width="65" />
<string
name="GroupBulkBan">
Group Ban
</string>
</panel>

4
indra/newview/skins/default/xui/en-us/panel_group_invite.xml
View File

@@ -26,7 +26,7 @@ Resident Chooser&apos; to start.
tool_tip="Choose from the list of Roles you are allowed to assign members to."
width="196" />
<button bottom="4" font="SansSerifSmall" halign="center" height="20"
label="Send Invitations" left="4" name="ok_button" width="130" />
label="Send Invitations" left="4" name="invite_button" width="130" />
<button bottom_delta="0" font="SansSerifSmall" halign="center" height="20"
label="Cancel" left_delta="132" name="cancel_button" width="70" />
<string name="confirm_invite_owner_str">
@@ -39,7 +39,7 @@ Resident Chooser&apos; to start.
Group Invitations not sent: too many Residents selected. Group Invitations are limited to 100 per request.
</string>
<!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
label="Send Invitations" left="65" name="ok_button" width="140" />
label="Send Invitations" left="65" name="invite_button" width="140" />
<button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"
label="Cancel" left_delta="0" name="cancel_button" width="140" /-->
<string name="loading">(loading...)</string>

89
indra/newview/skins/default/xui/en-us/panel_group_roles.xml
View File

@@ -57,6 +57,18 @@ easily be customized, allowing for greater organization and flexibility.
execute the Ability.
</text>
</panel>
<panel border="false" bottom_delta="0" height="24" left="7" name="banlist_header"
visible="false" width="380">
<text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0"
name="static" width="200">
Banned Residents
</text>
<text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
name="static2" width="394">
Examine which Residents are not allowed in this group. Members with the
'Manage ban list' ability may block certain residents from joining the group.
</text>
</panel>
<tab_container border="false" bottom_delta="-190" height="180" left="6"
name="roles_tab_container" tab_position="top" width="406">
<panel border="true" bottom="0" height="164" label="Members" left="1"
@@ -82,7 +94,8 @@ execute the Ability.
<button bottom_delta="-20" font="SansSerif" halign="center" height="19"
label="Invite New Member ..." left="4" name="member_invite" width="146" />
<button bottom_delta="0" font="SansSerif" halign="center" height="19"
label="Eject From Group" left="-153" name="member_eject" width="146" />
label="Eject From Group" left_delta="149" name="member_eject" width="146" />
<button bottom_delta="0" left_delta="149" width="100" follows="top|left" height="19" label="Ban Member(s)" name="member_ban"/>
<string name="help_text">
You can add or remove Roles assigned to Members.
Select multiple Members by holding the Ctrl key and
@@ -144,6 +157,21 @@ things in this group. There&apos;s a broad variety of Abilities.
</string>
<string name="power_folder_icon">inv_folder_plain_closed.tga</string>
</panel>
<panel
border="false"
height="303"
label="Banned Residents"
layout="topleft"
left="0"
right="-1"
help_topic="roles_banlist_tab"
name="banlist_sub_tab"
width="310">
<panel.string
name="help_text">
Any resident on the ban list will be unable to join the group.
</panel.string>
</panel>
</tab_container>
<panel border="false" bottom_delta="-235" height="215" left="7" name="members_footer"
select="true" visible="true" width="406">
@@ -265,4 +293,63 @@ things in this group. There&apos;s a broad variety of Abilities.
height="125" left="150" multi_select="true" name="action_members"
width="254" menu_num="0" name_system="GroupMembersNameSystem"/>
</panel>
<!-- Singu Note: This is a total hack, abusing that footer is not part of the tab container -->
<panel border="false" bottom="-500" height="425" left="7" name="banlist_footer" mouse_opaque="false" visible="false">
<name_list
column_padding="0"
draw_heading="true"
height="368"
follows="left|top|right"
layout="topleft"
left="0"
right="-1"
multi_select="true"
name="ban_list"
menu_num="0"
name_system="GroupMembersNameSystem"
bottom="-365">
<column
label="Resident"
name="name"
font_name="SANSSERIF_SMALL"
font-style="NORMAL"
relative_width="0.7" />
<column
label="Date Banned"
name="ban_date"
relative_width="0.3" />
</name_list>
<button
follows="top|left"
height="20"
label="Ban Resident(s)"
layout="topleft"
left="3"
name="ban_create"
tool_tip="Ban residents from your group"
width="120" />
<button
follows="top|left"
bottom_delta="0"
height="20"
label="Remove Ban(s)"
layout="topleft"
left_delta="125"
name="ban_delete"
tool_tip="Unban selected residents from your group"
width="120" />
<button
follows="top|left"
bottom_delta="0"
height="20"
width="100"
image_overlay="Refresh_Off"
image_overlay_alignment="left"
layout="topleft"
left_delta="165"
name="ban_refresh"
label="Refresh"
tool_tip="Refresh the ban list"
/>
</panel>
</panel>

3
indra/newview/skins/default/xui/en-us/role_actions.xml
View File

@@ -9,6 +9,9 @@
<action description="Eject Members from this Group"
longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-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 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;Signup Fee&apos;"
longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."