diff options
author | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
commit | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (patch) | |
tree | 6a257d591ad0f241c7fbd42acca72ea79e4c9cf6 /indra/newview/skins/default/xui/en/floater_toybox.xml | |
parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
parent | d6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_toybox.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_toybox.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index ef3951a1cd..493d44a9cf 100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -5,7 +5,7 @@ can_minimize="false" can_resize="false" default_tab_group="1" - height="460" + height="330" help_topic="toybox" layout="topleft" legacy_header_height="18" @@ -46,7 +46,7 @@ Buttons will appear as shown or as icon-only depending on each toolbar's settings. </text> <toolbar - bottom="395" + bottom="265" button_display_mode="icons_with_text" follows="all" left="20" @@ -82,20 +82,32 @@ <panel bevel_style="none" border="true" - bottom="396" + bottom="266" follows="left|bottom|right" left="20" right="-20" - top="396" /> + top="266" /> + <button + follows="left|bottom|right" + height="23" + label="Clear all toolbars" + label_selected="Clear all toolbars" + layout="topleft" + left="185" + name="btn_clear_all" + top="285" + width="130"> + <button.commit_callback function="Toybox.ClearAll" /> + </button> <button follows="left|bottom|right" height="23" label="Restore defaults" label_selected="Restore defaults" layout="topleft" - left="260" + left="335" name="btn_restore_defaults" - top="415" + top="285" width="130"> <button.commit_callback function="Toybox.RestoreDefaults" /> </button> |