summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_toybox.xml63
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml14
3 files changed, 75 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
new file mode 100644
index 0000000000..1951497309
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_dock="false"
+ can_minimize="false"
+ can_resize="false"
+ default_tab_group="1"
+ height="460"
+ help_topic="toybox"
+ layout="topleft"
+ legacy_header_height="18"
+ name="Toybox"
+ open_centered="true"
+ single_instance="true"
+ title="Customize toolbars"
+ width="658">
+ <text
+ follows="left|top"
+ font="SansSerifMedium"
+ halign="left"
+ height="20"
+ layout="topleft"
+ left="40"
+ length="1"
+ name="toybox label 1"
+ right="-40"
+ top="35"
+ type="string">
+ Add or remove buttons by dragging them to or from the toolbars.
+ </text>
+ <text
+ follows="left|top"
+ font="SansSerifMedium"
+ halign="left"
+ height="20"
+ layout="topleft"
+ left="40"
+ length="1"
+ name="toybox label 2"
+ right="-40"
+ top="55"
+ type="string">
+ Buttons will appear as shown or as icon-only depending on each toolbar's settings.
+ </text>
+ <toolbar
+ bottom="395"
+ left="40"
+ right="-40"
+ top="85">
+ </toolbar>
+ <button
+ follows="left|bottom"
+ height="23"
+ label="Restore defaults"
+ label_selected="Restore defaults"
+ layout="topleft"
+ left="40"
+ name="btn_restore_defaults"
+ top="415"
+ width="130">
+ <button.commit_callback function="Toybox.RestoreDefaults" />
+ </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4c4ff3e5c4..bb58dd500f 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -13,7 +13,7 @@
tear_off="true"
name="File">
<menu_item_call
- label="Preferences"
+ label="Preferences..."
name="Preferences..."
shortcut="control|P">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 36ebe73753..2e93243b0f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -9,14 +9,22 @@
name="Me"
tear_off="true">
<menu_item_call
- label="Preferences"
+ label="Preferences..."
name="Preferences"
shortcut="control|P">
<menu_item_call.on_click
function="Floater.Show"
parameter="preferences" />
</menu_item_call>
- <menu_item_call
+ <menu_item_call
+ label="Toolbars..."
+ name="Toolbars"
+ shortcut="control|T">
+ <menu_item_call.on_click
+ function="Floater.Toggle"
+ parameter="toybox" />
+ </menu_item_call>
+ <menu_item_call
label="My Dashboard"
name="Manage My Account">
<menu_item_call.on_click
@@ -2855,7 +2863,7 @@
function="ToggleControl"
parameter="BottomPanelNew" />
</menu_item_check>-->
- <menu_item_call
+ <menu_item_call
label="Media Browser Test"
name="Web Browser Test">
<menu_item_call.on_click