summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
committerOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
commit61bddc22d97150cd590bc4184355133b6dd3ff87 (patch)
tree59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/skins/default/xui/en
parenta18d4df6c742aa397b70e4dafb41475bd201a558 (diff)
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_inspect.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml7
-rw-r--r--indra/newview/skins/default/xui/en/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_script_debug.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/en/menu_gesture_gear.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory.xml37
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml24
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml17
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml40
-rw-r--r--indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_uploads.xml135
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml2
17 files changed, 260 insertions, 48 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8391bacf51..a137770e26 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2014,7 +2014,7 @@ Only large parcels can be listed in search.
name="AllowedText"
top="0"
width="230">
- Allowed Residents ([COUNT])
+ Allowed Residents ([COUNT], max [MAX])
</text>
<name_list
column_padding="0"
@@ -2063,7 +2063,7 @@ Only large parcels can be listed in search.
name="BanCheck"
top="0"
width="200">
- Banned Residents ([COUNT])
+ Banned Residents ([COUNT], max [MAX])
</text>
<name_list
column_padding="0"
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index bea35e5fc1..63334e2b24 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -27,21 +27,21 @@
tool_tip="Select an object from this list to highlight it in-world"
top="20">
<scroll_list.columns
- dynamic_width="true"
+ relative_width="0.25"
label="Object Name"
name="object_name" />
<scroll_list.columns
- dynamic_width="true"
+ relative_width="0.25"
label="Owner Name"
name="owner_name" />
<scroll_list.columns
- dynamic_width="true"
+ relative_width="0.25"
label="Creator Name"
name="creator_name" />
<scroll_list.columns
+ relative_width="0.25"
label="Creation Date"
- name="creation_date"
- width="150" />
+ name="creation_date" />
<scroll_list.commit_callback
function="Inspect.SelectObject" />
</scroll_list>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 52d03cc432..00d70556b4 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -290,7 +290,7 @@
layout="topleft"
left="0"
height="67"
- width="1010">
+ width="1070">
<text
name="linksets_actions_label"
height="13"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 9a9101e0da..5ca527ad20 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -120,6 +120,13 @@
layout="topleft"
help_topic="preferences_advanced1_tab"
name="advanced1" />
+ <panel
+ class="panel_preference"
+ filename="panel_preferences_uploads.xml"
+ label="Uploads"
+ layout="topleft"
+ help_topic="preferences_uploads_tab"
+ name="uploads" />
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index b53698a9f2..62cce3a1e3 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -7,6 +7,7 @@
save_rect="true"
save_visibility="true"
title="SCENE LOAD STATISTICS"
+ min_width="250"
width="400">
<scroll_container follows="top|left|bottom|right"
bottom="400"
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
index 53d4925214..cd88048d6b 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml
@@ -7,6 +7,7 @@
help_topic="script_debug_floater"
save_rect="true"
title="Script Warning/Error"
+ reuse_instance="true"
width="450">
<tab_container
follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index be9b93837a..e4f735740b 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -8,6 +8,7 @@
save_rect="true"
save_visibility="true"
title="STATISTICS"
+ min_width="250"
width="270">
<scroll_container follows="all"
height="380"
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
index b08d21e8f4..c1458977ca 100644
--- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -5,8 +5,7 @@
name="menu_gesture_gear"
visible="false">
<menu_item_call
- font="SansSerifBold"
- label="Add/Remove from Favorites"
+ label="Activate/Deactivate selected gesture"
layout="topleft"
name="activate">
<on_click
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 5b8a9413bf..e1f9269c70 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -322,6 +322,43 @@
</menu_item_call>
</menu>
<menu
+ label="Use as default for"
+ layout="topleft"
+ name="upload_def">
+ <menu_item_call
+ label="Image uploads"
+ layout="topleft"
+ name="Image uploads">
+ <menu_item_call.on_click
+ function="Inventory.FileUploadLocation"
+ parameter="texture" />
+ </menu_item_call>
+ <menu_item_call
+ label="Sound uploads"
+ layout="topleft"
+ name="Sound uploads">
+ <menu_item_call.on_click
+ function="Inventory.FileUploadLocation"
+ parameter="sound" />
+ </menu_item_call>
+ <menu_item_call
+ label="Animation uploads"
+ layout="topleft"
+ name="Animation uploads">
+ <menu_item_call.on_click
+ function="Inventory.FileUploadLocation"
+ parameter="animation" />
+ </menu_item_call>
+ <menu_item_call
+ label="Model uploads"
+ layout="topleft"
+ name="Model uploads">
+ <menu_item_call.on_click
+ function="Inventory.FileUploadLocation"
+ parameter="model" />
+ </menu_item_call>
+ </menu>
+ <menu
label="Change Type"
layout="topleft"
name="Change Type">
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a39ee5fddd..8cd0c415f4 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -20,6 +20,18 @@
function="Floater.Toggle"
parameter="preferences" />
</menu_item_call>
+ <menu_item_check
+ label="Show Grid Picker"
+ name="Show Grid Picker"
+ visible="false"
+ shortcut="control|shift|G">
+ <on_check
+ function="CheckControl"
+ parameter="ForceShowGrid" />
+ <on_click
+ function="ToggleControl"
+ parameter="ForceShowGrid" />
+ </menu_item_check>
<menu_item_separator />
<menu_item_call
label="Exit [APP_NAME]"
@@ -287,18 +299,6 @@
parameter="4" />
</menu_item_check>
</menu>
- <menu_item_check
- label="Show Grid Picker"
- name="Show Grid Picker"
- visible="false"
- shortcut="control|shift|G">
- <on_check
- function="CheckControl"
- parameter="ForceShowGrid" />
- <on_click
- function="ToggleControl"
- parameter="ForceShowGrid" />
- </menu_item_check>
<menu_item_call
label="Show Notifications Console"
name="Show Notifications Console"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f911c2da7b..332d79e1ea 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -447,6 +447,13 @@
function="Floater.Toggle"
parameter="mini_map" />
</menu_item_check>
+ <menu_item_call
+ label="Events"
+ name="Events">
+ <menu_item_call.on_click
+ function="Advanced.ShowURL"
+ parameter="http://events.secondlife.com"/>
+ </menu_item_call>
<menu_item_check
label="Search..."
name="Search"
@@ -1018,6 +1025,16 @@
label="Scripts"
name="Scripts"
tear_off="true">
+ <menu_item_check
+ label="Script warnings/errors..."
+ name="Script debug">
+ <menu_item_check.on_check
+ function="Floater.IsOpen"
+ parameter="script_debug" />
+ <menu_item_check.on_click
+ function="Floater.ToggleOrBringToFront"
+ parameter="script_debug" />
+ </menu_item_check>
<menu_item_call
label="Recompile Scripts (Mono)"
name="Mono">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index da777417ac..04a636b09e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4031,7 +4031,7 @@ An update was downloaded. It will be installed during restart.
icon="alertmodal.tga"
name="UpdateCheckError"
type="alertmodal">
-An error occured while checking for update.
+An error occurred while checking for update.
Please try again later.
<tag>confirm</tag>
<usetemplate
@@ -9844,29 +9844,29 @@ Eject failed because you don't have admin permission for that parcel.
<notification
icon="alertmodal.tga"
- name="CantMoveObjectParcelFull"
+ name="CMOParcelFull"
type="notify">
<tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+Can't move object '[O]' to
+[P] in region [R] because the parcel is full.
</notification>
<notification
icon="alertmodal.tga"
- name="CantMoveObjectParcelPerms"
+ name="CMOParcelPerms"
type="notify">
<tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+Can't move object '[O]' to
+[P] in region [R] because your objects are not allowed on this parcel.
</notification>
<notification
icon="alertmodal.tga"
- name="CantMoveObjectParcelResources"
+ name="CMOParcelResources"
type="notify">
<tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+Can't move object '[O]' to
+[P] in region [R] because there are not enough resources for this object on this parcel.
</notification>
<notification
@@ -9879,29 +9879,29 @@ Copy failed because you lack access to that parcel.
<notification
icon="alertmodal.tga"
- name="CantMoveObjectRegionVersion"
+ name="CMORegionVersion"
type="notify">
- <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+ <tag>fail</tag>
+ Can't move object '[O]' to
+ [P] in region [R] because the other region is running an older version which does not support receiving this object via region crossing.
</notification>
<notification
icon="alertmodal.tga"
- name="CantMoveObjectNavMesh"
+ name="CMONavMesh"
type="notify">
<tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+Can't move object '[O]' to
+[P] in region [R] because you cannot modify the navmesh across region boundaries.
</notification>
<notification
icon="alertmodal.tga"
- name="CantMoveObjectWTF"
+ name="CMOWTF"
type="notify">
<tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+Can't move object '[O]' to
+[P] in region [R] because of an unknown reason. ([F])
</notification>
<notification
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 53d0252215..574e5f3cbc 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -90,13 +90,26 @@
top_delta="0"
width="31"/>
</panel>
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ height="14"
+ layout="topleft"
+ right="-10"
+ top_pad="4"
+ left="3"
+ use_ellipses="true"
+ name="block_limit">
+ [COUNT] entries in your block list, and the limit is [LIMIT].
+ </text>
<block_list
follows="all"
- height="273"
+ height="255"
layout="topleft"
left="3"
name="blocked"
tool_tip="List of currently blocked Residents"
- top="31"
+ top_pad="4"
right="-1"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index ff0714adbb..eeb930485e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -26,10 +26,11 @@
layout="topleft"
left="5"
name="appearance_tabs"
- tab_min_width="150"
+ tab_min_width="100"
tab_height="30"
tab_position="top"
halign="center"
+ hide_scroll_arrows="true"
top="8"
width="315">
<panel
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..487da54fdf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+ border="true"
+ follows="all"
+ height="408"
+ label="Uploads"
+ layout="topleft"
+ left="102"
+ name="uploads"
+ top="1"
+ width="517">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="33"
+ name="title"
+ top_pad="10"
+ width="250">
+ Current destination folders for uploads
+ </text>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="37"
+ name="title_models"
+ top_pad="17"
+ width="100">
+ Images
+ </text>
+ <text
+ type="string"
+ use_ellipses="true"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ font.style="BOLD"
+ left="37"
+ name="upload_textures"
+ top_pad="5"
+ width="350" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="37"
+ name="title_sounds"
+ top_pad="7"
+ width="100">
+ Sounds
+ </text>
+ <text
+ type="string"
+ use_ellipses="true"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ font.style="BOLD"
+ left="37"
+ name="upload_sounds"
+ top_pad="5"
+ width="350" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="37"
+ name="title_animation"
+ top_pad="7"
+ width="100">
+ Animations
+ </text>
+ <text
+ type="string"
+ use_ellipses="true"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ font.style="BOLD"
+ left="37"
+ name="upload_animation"
+ top_pad="5"
+ width="350" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="37"
+ name="title_animation"
+ top_pad="7"
+ width="100">
+ Models
+ </text>
+ <text
+ type="string"
+ use_ellipses="true"
+ follows="left|top"
+ height="23"
+ layout="topleft"
+ font.style="BOLD"
+ left="37"
+ name="upload_models"
+ top_pad="5"
+ width="350" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="30"
+ layout="topleft"
+ font.style="ITALIC"
+ left="33"
+ name="upload_help"
+ top_pad="6"
+ width="387">
+ To change a destination folder, right click on it in inventory and choose
+ "Use as default for"
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 88ad8bbf7b..b75f631799 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3815,7 +3815,7 @@ Abuse Report</string>
<string name="Male - Laugh">Male - Laugh</string>
<string name="Male - Repulsed">Male - Repulsed</string>
<string name="Male - Shrug">Male - Shrug</string>
- <string name="Male - Stick tougue out">Male - Stick tougue out</string>
+ <string name="Male - Stick tougue out">Male - Stick tongue out</string>
<string name="Male - Wow">Male - Wow</string>
<string name="Female - Chuckle">Female - Chuckle</string>
@@ -3834,7 +3834,7 @@ Abuse Report</string>
<string name="Female - Please">Female - Please</string>
<string name="Female - Repulsed">Female - Repulsed</string>
<string name="Female - Shrug">Female - Shrug</string>
- <string name="Female - Stick tougue out">Female - Stick tougue out</string>
+ <string name="Female - Stick tougue out">Female - Stick tongue out</string>
<string name="Female - Wow">Female - Wow</string>
<string name="/bow">/bow</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 61ec046649..674be59753 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -133,7 +133,7 @@
name="damage_text"
width="35"
height="18"
- top="17"
+ top="18"
follows="right|top"
halign="right"
font="SansSerifSmall"