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

Merge in EAM from viewer-release

Browse Source 
Remove the derpy stuff lindens like to do
Wide strings aren't normal strings

Make it all a bit better~
Redid the Duration floater because it was kinda icky,
gave it more flexibility~<3
Display parcel ban and access durations as dates instead of text, sortable!
Reworked the rather icky lookin' Access panel control ordering
Enabled lowering parcel ban time without needing to find and remove first
This commit is contained in:
Lirusaito
2019-07-19 02:21:25 -04:00
parent 3f921251ee
commit d0a6772245
22 changed files with 2448 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -1349,6 +1349,7 @@ Select the thumbnail to choose a different texture.
<string name="1_second">1 second</string>
<string name="seconds">seconds</string>
<string name="remaining">remaining</string>
<string name="Always">Always</string>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Allow Group Access: [GROUP]"
left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"
@@ -1377,13 +1378,16 @@ Select the thumbnail to choose a different texture.
<text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
height="16" initial_value="false" label="Always Allow" left="20"
mouse_opaque="true" name="AllowedText" radio_style="false" width="195">
Allowed Residents
Allowed ([COUNT], max [MAX])
</text>
<name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
column_padding="0" draw_border="true" draw_heading="false" enabled="true"
follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
column_padding="0" draw_border="true" draw_heading="true" enabled="true"
follows="top|bottom" heading_font="SansSerifSmall" heading_height="16"
height="80" left="20" mouse_opaque="true" multi_select="true" name_system="LandManagementNameSystem"
name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0">
<column label="Name" name="name" width="120"/>
<column label="Duration" name="duration" width="75"/>
</name_list>
<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
halign="center" height="16" label="Add..." label_selected="Add..."
left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
@@ -1393,17 +1397,18 @@ Select the thumbnail to choose a different texture.
left_delta="100" mouse_opaque="true" name="remove_allowed"
scale_image="true" width="80" />
<text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
height="16" initial_value="false"
label="Ban" left="240" mouse_opaque="true"
name="BanCheck" radio_style="false" width="195">
Banned Residents
height="16" left="240" mouse_opaque="true" name="BanCheck" width="195">
Banned ([COUNT], max [MAX])
</text>
<name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
column_padding="0" draw_border="true" draw_heading="false" enabled="true"
column_padding="0" draw_border="true" draw_heading="true" enabled="true"
follows="top|bottom" heading_font="SansSerifSmall"
heading_height="14" height="80" left_delta="0" mouse_opaque="true"
heading_height="16" height="80" left_delta="0" mouse_opaque="true"
multi_select="true" name="BannedList" name_system="LandManagementNameSystem"
tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0">
<column label="Name" name="name" width="120"/>
<column label="Duration" name="duration" width="75"/>
</name_list>
<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
halign="center" height="16" label="Add..." label_selected="Add..."
left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"

55
indra/newview/skins/default/xui/en-us/floater_ban_duration.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_minimize="false"
can_tear_off="false"
can_resize="false"
can_drag_on_left="false"
can_close="true"
height="80"
layout="topleft"
name="ban_duration"
title="Duration"
single_instance="true"
width="180">
<!-- Liru make this a combo: Hours, Days, Weeks, Months -->
<combo_box name="ban_duration_combo" bottom="-40" left="10" height="20" width="100" initial_value="0">
<combo_item name="permanent" label="Permanent" value="0"/>
<combo_item name="hours" label="Hours" value="1"/>
<combo_item name="days" label="Days" value="2"/>
<combo_item name="weeks" label="Weeks" value="3"/>
<combo_item name="months" label="Months" value="4"/>
</combo_box>
<spinner
allow_digits_only="true"
decimal_digits="0"
follows="left|top"
height="20"
increment="1"
max_val="8766"
min_val="1"
initial_val="1"
name="ban_duration"
bottom_delta="-2"
left_delta="100"
width="60"/>
<button
follows="left|top"
height="23"
label="OK"
left="10"
name="ok_btn"
bottom_delta="-30"
width="80">
</button>
<button
follows="left|top"
height="23"
label="Cancel"
left_delta="80"
name="cancel_btn"
bottom_delta="0"
width="80">
</button>
</floater>

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

@@ -3390,6 +3390,69 @@ You can only have [MAX_MANAGER] Estate Managers.
type="alertmodal">
Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
</notification>
<notification
icon="alertmodal.tga"
name="ProblemAddingEstateManagerBanned"
type="alertmodal">
Unable to add banned resident to estate manager list.
</notification>
<notification
icon="alertmodal.tga"
name="ProblemBanningEstateManager"
type="alertmodal">
Unable to add estate manager [AGENT] to banned list.
</notification>
<notification
icon="alertmodal.tga"
name="GroupIsAlreadyInList"
type="alertmodal">
&lt;nolink&gt;[GROUP]&lt;/nolink&gt; is already in the Allowed Groups list.
</notification>
<notification
icon="alertmodal.tga"
name="AgentIsAlreadyInList"
type="alertmodal">
[AGENT] is already in your [LIST_TYPE] list.
</notification>
<notification
icon="alertmodal.tga"
name="AgentsAreAlreadyInList"
type="alertmodal">
[AGENT] are already in your [LIST_TYPE] list.
</notification>
<notification
icon="alertmodal.tga"
name="AgentWasAddedToList"
type="alertmodal">
[AGENT] was added to [LIST_TYPE] list of [ESTATE].
</notification>
<notification
icon="alertmodal.tga"
name="AgentsWereAddedToList"
type="alertmodal">
[AGENT] were added to [LIST_TYPE] list of [ESTATE].
</notification>
<notification
icon="alertmodal.tga"
name="AgentWasRemovedFromList"
type="alertmodal">
[AGENT] was removed from [LIST_TYPE] list of [ESTATE].
</notification>
<notification
icon="alertmodal.tga"
name="AgentsWereRemovedFromList"
type="alertmodal">
[AGENT] were removed from [LIST_TYPE] list of [ESTATE].
</notification>
<notification
icon="alertmodal.tga"

466
indra/newview/skins/default/xui/en-us/panel_region_access.xml Normal file
View File

@@ -0,0 +1,466 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="top|left"
height="510"
help_topic="panel_region_access_tab"
label="Access"
layout="topleft"
left="0"
name="Access"
bottom="320"
width="480">
<tab_container
bottom="-10"
follows="all"
layout="topleft"
left="3"
name="tabs"
tab_min_width="70"
tab_height="30"
tab_position="top"
top="-1"
halign="center"
right="-5">
<!-- ============================= ESTATE MANAGERS tab ====================== -->
<panel
background_opaque="true"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
label="Estate Managers"
layout="topleft"
left="0"
help_topic="estate_managers_tab"
name="estate_managers_panel"
right="-1"
top="0">
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
name="estate_manager_label"
bottom="-20"
left="10"
width="200">
Estate Managers:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="estate_manager_help"
right="-10"
width="18" />
<!-- Estate Managers box -->
<view_border
bevel_style="none"
follows="top|left"
height="400"
layout="topleft"
left="10"
bottom_delta="-408"
width="498" />
<name_list
follows="left|top"
height="400"
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
name="estate_manager_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
label="Name"
name="name"
width="498" />
</name_list>
<!-- Estate Managers buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_estate_manager_btn"
bottom_delta="-29"
width="114" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
left_delta="123"
bottom_delta="0"
width="114" />
</panel>
<!-- ================================ ALLOWED tab =========================== -->
<panel
background_opaque="true"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
label="Allowed"
layout="topleft"
left="0"
help_topic="allowed_tab"
name="allowed_panel"
right="-1"
top="0">
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
name="allow_resident_label"
bottom="-20"
left="10"
width="200">
Allowed Residents:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="allow_resident_help"
right="-10"
width="18" />
<panel
follows="left|top|right"
height="27"
label="top_panel"
layout="topleft"
left="0"
name="allowed_search_panel"
right="-1"
bottom_delta="-27">
<filter_editor
follows="left|top|right"
height="23"
layout="topleft"
left="10"
label="Search allowed agents"
max_length_chars="300"
name="allowed_search_input"
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_allowed_list_btn"
width="60" />
</panel>
<!-- Always allowed box -->
<view_border
bevel_style="none"
follows="top|left"
height="373"
layout="topleft"
left="10"
bottom_delta="-381"
width="498" />
<name_list
follows="left|top"
height="370"
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
name="allowed_avatar_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
label="Name"
name="name"
width="498" />
</name_list>
<!-- Allowed Residents buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_allowed_avatar_btn"
bottom_delta="-29"
width="114" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
left_delta="123"
bottom_delta="0"
width="114" />
</panel>
<!-- ============================= ALLOWED GROUPS tab ======================= -->
<panel
background_opaque="true"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
label="Allowed Groups"
layout="topleft"
left="0"
help_topic="allowed_groups_tab"
name="allowed_groups_panel"
right="-1"
top="0">
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="allow_group_label"
bottom="-20"
width="200">
Allowed Groups:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="allow_group_help"
right="-10"
width="18" />
<panel
follows="left|top|right"
height="27"
label="top_panel"
layout="topleft"
left="0"
name="allowed_group_search_panel"
right="-1"
bottom_delta="-27">
<filter_editor
follows="left|top|right"
height="23"
layout="topleft"
left="10"
label="Search allowed groups"
max_length_chars="300"
name="allowed_group_search_input"
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_allowed_group_list_btn"
width="60" />
</panel>
<!-- Groups always allowed box -->
<view_border
bevel_style="none"
follows="top|left"
height="373"
layout="topleft"
left="10"
bottom_delta="-381"
width="498" />
<name_list
follows="left|top"
height="370"
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
name="allowed_group_name_list"
bottom_delta="0"
width="498">
<columns
label="Name"
name="name"
width="498" />
</name_list>
<!-- Groups always allowed buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_allowed_group_btn"
bottom_delta="-29"
width="114" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
left_delta="123"
bottom_delta="0"
width="114" />
</panel>
<!-- ================================ BANNED tab ============================ -->
<panel
background_opaque="true"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
label="Banned"
layout="topleft"
left="0"
help_topic="banned_tab"
name="banned_panel"
right="-1"
top="0">
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="ban_resident_label"
bottom="-20"
width="200">
Banned Residents:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="ban_resident_help"
right="-10"
width="18" />
<panel
follows="left|top|right"
height="27"
label="top_panel"
layout="topleft"
left="0"
name="banned_search_panel"
right="-1"
bottom_delta="-27">
<filter_editor
follows="left|top|right"
height="23"
layout="topleft"
left="10"
label="Search banned agents"
max_length_chars="300"
name="banned_search_input"
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_banned_list_btn"
width="60" />
</panel>
<!-- Always banned box -->
<view_border
bevel_style="none"
follows="top|left"
height="373"
layout="topleft"
left="10"
bottom_delta="-381"
width="498" />
<name_list
follows="left|top"
height="370"
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
name="banned_avatar_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
label="Name"
name="name"
width="140" />
<columns
label="Last login date"
name="last_login_date"
width="100" />
<columns
label="Date banned"
name="ban_date"
width="100" />
<columns
label="Banned by"
name="bannedby"
width="140" />
</name_list>
<!-- Always banned buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_banned_avatar_btn"
bottom_delta="-29"
width="114" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
left_delta="123"
bottom_delta="0"
width="114" />
</panel>
</tab_container>
</panel>

248
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -198,254 +198,6 @@
bottom_delta="-16"
width="278" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
name="estate_manager_label"
bottom_delta="-28"
left="10"
width="200">
Estate Managers:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="estate_manager_help"
left_delta="202"
width="18" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="250"
name="allow_resident_label"
bottom_delta="-4"
width="200">
Allowed Residents:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="allow_resident_help"
left_delta="202"
width="18" />
<!-- Estate Managers box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
left="10"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
name="estate_manager_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="220" />
<!-- Allowed Residents box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
left="250"
bottom_delta="0"
width="220" />
<name_list
follows="left|top"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
name="allowed_avatar_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="220" />
<!-- Estate Managers buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_estate_manager_btn"
bottom_delta="-26"
width="97" />
<button
bottom_delta="0"
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
left_delta="123"
width="97" />
<!-- Allowed Residents buttons -->
<button
follows="left|top"
height="23"
left="250"
label="Add..."
layout="topleft"
name="add_allowed_avatar_btn"
bottom_delta="0"
width="97" />
<button
follows="left|top"
height="20"
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
left_delta="123"
bottom_delta="0"
width="97" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="allow_group_label"
bottom_delta="-28"
width="200">
Allowed Groups:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="allow_group_help"
left_delta="202"
width="18" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="250"
name="ban_resident_label"
bottom_delta="-4"
width="200">
Banned Residents:
</text>
<button
bottom_delta="3"
follows="left|top"
font="SansSerifSmall"
height="18"
label="?"
name="ban_resident_help"
left_delta="202"
width="18" />
<!-- Allowed Groups box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
left="10"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
name="allowed_group_name_list"
bottom_delta="0"
width="220" />
<!-- Banned Residents box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
left="250"
bottom_delta="0"
width="220" />
<name_list
follows="left|top"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
name="banned_avatar_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="220" />
<!-- Allowed Groups buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_allowed_group_btn"
bottom_delta="-26"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
left_delta="123"
bottom_delta="0"
width="97" />
<!-- Banned Residents buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="250"
name="add_banned_avatar_btn"
bottom_delta="0"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
bottom_delta="0"
left_delta="123"
width="97" />
<button
follows="left|top"
height="23"

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

@@ -3671,6 +3671,10 @@ If you continue to receive this message, please contact Second Life support for
<string name="RegionInfoBannedResidents">Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])</string>
<string name="RegionInfoListTypeAllowedAgents">Allowed Residents</string>
<string name="RegionInfoListTypeBannedAgents">Banned Residents</string>
<string name="RegionInfoAllEstates">all estates</string>
<string name="RegionInfoManagedEstates">managed estates</string>
<string name="RegionInfoThisEstate">this estate</string>
<string name="AndNMore">and [EXTRA_COUNT] more</string>
<!-- script limits floater -->
<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>