36b75b2398
[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
354 lines
16 KiB
XML
354 lines
16 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel border="true" bottom="0" height="466" label="Members" left="1"
|
|
name="roles_tab" width="418">
|
|
<string name="default_needs_apply_text">
|
|
There are unapplied changes on the current sub-tab.
|
|
</string>
|
|
<string name="want_apply_text">
|
|
Do you want to apply these changes?
|
|
</string>
|
|
<string name="help_text" />
|
|
<button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
|
|
name="help_button" width="20" />
|
|
<panel border="false" bottom="-24" height="24" left="7" name="members_header"
|
|
visible="true" width="380">
|
|
<text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
|
|
name="static" width="150">
|
|
Members & Roles
|
|
</text>
|
|
<text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
|
|
name="static2" width="400">
|
|
Group Members are assigned Roles with Abilities. These settings can
|
|
easily be customized, allowing for greater organization and flexibility.
|
|
</text>
|
|
</panel>
|
|
<panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
|
|
visible="false" width="380">
|
|
<text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
|
|
name="static" width="100">
|
|
Roles
|
|
</text>
|
|
<text bottom_delta="-20" font="SansSerifSmall" halign="left" height="16" left="0"
|
|
name="role_properties_modifiable" visible="false" width="394">
|
|
Select a Role below. You can modify its Name, Description and Member Title.
|
|
</text>
|
|
<text bottom_delta="0" font="SansSerifSmall" halign="left" height="16" left="0"
|
|
name="role_properties_not_modifiable" visible="true" width="394">
|
|
Select a Role below to see its properties, Members and allowed Abilities.
|
|
</text>
|
|
<text bottom_delta="-14" font="SansSerifSmall" halign="left" height="16" left="0"
|
|
name="role_actions_modifiable" visible="false" width="394">
|
|
You can also assign Abilities to the Role.
|
|
</text>
|
|
<text bottom_delta="0" font="SansSerifSmall" halign="left" height="16" left="0"
|
|
name="role_actions_not_modifiable" visible="true" width="394">
|
|
You may view, but not modify, assigned Abilities.
|
|
</text>
|
|
</panel>
|
|
<panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
|
|
visible="false" width="380">
|
|
<text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0"
|
|
name="static" width="200">
|
|
Abilities
|
|
</text>
|
|
<text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
|
|
name="static2" width="394">
|
|
You can view an Ability's Description and which Roles and Members can
|
|
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"
|
|
name="members_sub_tab" select="true" tool_tip="Members" width="406">
|
|
<string name="donation_area">
|
|
[AREA] m²
|
|
</string>
|
|
<filter_editor bevel_style="in" border_style="line"
|
|
border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
|
|
height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
|
|
name="filter_input" width="100" />
|
|
<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-123"
|
|
column_padding="0" draw_border="true" draw_heading="true"
|
|
heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem"
|
|
heading_height="14" height="120" left="4" multi_select="true"
|
|
name="member_list" width="396">
|
|
<column label="Member Name" name="name" width="136" />
|
|
<column label="Donated Tier" name="donated" width="136" />
|
|
<column label="Last Login" name="online" width="116" />
|
|
</name_list>
|
|
<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_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
|
|
clicking on their names.
|
|
</string>
|
|
<string name="power_folder_icon">inv_folder_plain_closed.tga</string>
|
|
</panel>
|
|
<panel border="true" bottom="0" height="164" label="Roles"
|
|
left="1" name="roles_sub_tab" width="398">
|
|
<filter_editor bevel_style="in" border_style="line"
|
|
border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
|
|
height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
|
|
name="filter_input" width="100" />
|
|
<scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-120"
|
|
column_padding="0" draw_border="true" draw_heading="true" enabled="true"
|
|
follows="left|top"
|
|
heading_font="SansSerifSmall" heading_height="14" height="120" left="4"
|
|
mouse_opaque="true" multi_select="false" name="role_list" width="396">
|
|
<column label="Role Name" name="name" width="126" />
|
|
<column label="Title" name="title" width="186" />
|
|
<column label="Members" name="members" width="76" />
|
|
</scroll_list>
|
|
<button bottom_delta="-21" font="SansSerif" halign="center" height="19"
|
|
label="Create New Role ..." left="4" name="role_create" width="146" />
|
|
<button bottom_delta="0" font="SansSerif" halign="center" height="19"
|
|
label="Delete Role" left="-153" name="role_delete" width="146" />
|
|
<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.
|
|
</string>
|
|
<string name="cant_delete_role">
|
|
The 'Everyone' and 'Owners' Roles are special and cannot be deleted.
|
|
</string>
|
|
<string name="power_folder_icon">inv_folder_plain_closed.tga</string>
|
|
<string name="power_all_have_icon">checkbox_enabled_true.tga</string>
|
|
<string name="power_partial_icon">checkbox_enabled_false.tga</string>
|
|
</panel>
|
|
<panel border="true" bottom="0"
|
|
height="164" label="Abilities" left="1" name="actions_sub_tab" width="398">
|
|
<filter_editor bevel_style="in" border_style="line"
|
|
border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
|
|
height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
|
|
name="filter_input" width="100" />
|
|
<scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-134"
|
|
column_padding="0" draw_border="true" draw_heading="false"
|
|
draw_stripes="false"
|
|
follows="left|top" height="134" left="6"
|
|
mouse_opaque="true" multi_select="true" name="action_list"
|
|
search_column="1" tool_tip="Select an Ability to view more details."
|
|
width="392">
|
|
<column label="" name="icon" width="18" />
|
|
<column label="" name="action" width="356" />
|
|
</scroll_list>
|
|
<string name="help_text">
|
|
Abilities allow Members in Roles to do specific
|
|
things in this group. There'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">
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static" width="100">
|
|
Assigned Roles
|
|
</text>
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
|
|
name="static2" width="150">
|
|
Allowed Abilities
|
|
</text>
|
|
<scroll_list bottom_delta="-199" draw_border="true" draw_heading="false"
|
|
draw_stripes="false" enabled="false" height="198" left="0"
|
|
multi_select="false" name="member_assigned_roles" width="145">
|
|
<column label="" name="checkbox" width="18" />
|
|
<column label="" name="role" width="109" />
|
|
</scroll_list>
|
|
<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
|
|
enabled="false" height="198" left="150" multi_select="false"
|
|
name="member_allowed_actions"
|
|
tool_tip="For Details of each Allowed Ability see the Abilities tab."
|
|
width="254">
|
|
<column label="" name="icon" width="14" />
|
|
<column label="" name="action" width="224" />
|
|
</scroll_list>
|
|
</panel>
|
|
<panel border="false" bottom_delta="0" height="215" left="7" name="roles_footer"
|
|
visible="false" width="406">
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static" width="100">
|
|
Name
|
|
</text>
|
|
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
|
bottom_delta="0" drop_shadow_visible="false" font="SansSerif" halign="left"
|
|
height="16" left="150" name="static2"
|
|
width="100">
|
|
Description
|
|
</text>
|
|
<line_editor bevel_style="in" bg_visible="false"
|
|
border_drop_shadow_visible="false" border_style="line" border_thickness="1"
|
|
border_visible="false" bottom_delta="-16" drop_shadow_visible="false"
|
|
follows="left|top" font="SansSerifSmall" height="16" is_unicode="false"
|
|
left="0" max_length="20" mouse_opaque="true" name="role_name"
|
|
width="145" spell_check="true">
|
|
Employees
|
|
</line_editor>
|
|
<text bottom_delta="-16" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static3" width="100">
|
|
Title
|
|
</text>
|
|
<line_editor bevel_style="in" bg_visible="false" border_drop_shadow_visible="false"
|
|
border_style="line" border_thickness="1" border_visible="false"
|
|
bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
|
|
font="SansSerifSmall" height="16" is_unicode="false" left="0"
|
|
max_length="20" mouse_opaque="true" name="role_title"
|
|
width="145" spell_check="true">
|
|
(waiting)
|
|
</line_editor>
|
|
<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
|
bottom_delta="0" drop_shadow_visible="false" font="SansSerifSmall"
|
|
h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
|
|
max_length="254" name="role_description"
|
|
v_pad="0" width="254"
|
|
word_wrap="true" spell_check="true">
|
|
(waiting)
|
|
</text_editor>
|
|
<text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static4" width="120">
|
|
Assigned Members
|
|
</text>
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
|
|
name="static5"
|
|
tool_tip="A list of Abilities the currently selected role can perform."
|
|
width="240">
|
|
Allowed Abilities
|
|
</text>
|
|
<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
|
|
height="105" left="0" multi_select="true" name="role_assigned_members"
|
|
width="145" menu_num="0" name_system="GroupMembersNameSystem"/>
|
|
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
|
|
initial_value="false" label="Members are visible" left="0"
|
|
mouse_opaque="true" name="role_visible_in_list" radio_style="false"
|
|
tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
|
|
width="361" />
|
|
<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
|
|
height="125" left="150" multi_select="false" name="role_allowed_actions"
|
|
search_column="2"
|
|
tool_tip="For Details of each Allowed Ability see the Abilities tab."
|
|
width="254">
|
|
<column label="" name="icon" width="2" />
|
|
<column label="" name="checkbox" width="16" />
|
|
<column label="" name="action" width="220" />
|
|
</scroll_list>
|
|
</panel>
|
|
<panel border="false" bottom_delta="0" height="215" left="7" name="actions_footer"
|
|
visible="false" width="406">
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static" width="100">
|
|
Description
|
|
</text>
|
|
<text_editor bevel_style="in" bottom_delta="-48"
|
|
enabled="false" font="SansSerifSmall" h_pad="0" halign="left" height="48"
|
|
hide_scrollbar="true" left="0" max_length="512" name="action_description"
|
|
v_pad="0" width="404" word_wrap="true">
|
|
This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner.
|
|
</text_editor>
|
|
<text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
|
|
name="static2" width="145">
|
|
Roles with Ability
|
|
</text>
|
|
<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
|
|
name="static3" width="200">
|
|
Members with Ability
|
|
</text>
|
|
<scroll_list bottom_delta="-125" draw_border="true" enabled="false" height="125" left="0"
|
|
multi_select="false" name="action_roles" width="145" />
|
|
<name_list background_opaque="true" background_visible="true" bg_alpha_color="blue"
|
|
bg_opaque_color="grey" bottom_delta="0" draw_border="true"
|
|
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>
|