diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 10:20:18 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 10:20:18 -0700 |
commit | 7483d339ed8abe9785ddb33a72496bf8d4d63fa8 (patch) | |
tree | 3529c865d0f8e10bfa5172b8ea3e5c909f1e5e43 /indra/newview/skins/default/xui/en/widgets | |
parent | 795ae760e8b81a4e1b0ae4666d94d80919305189 (diff) | |
parent | b7cf5ff947161d0b7e42a9ed8fe10741bb7af100 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index a7f73c0c7c..32bc88cc9a 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toolbar background_image = "Rounded_Rect"> - <button_icon_and_text - follows="none" - height="30" - chrome="true" - auto_resize="true" - /> - <button_icon - follows="none" - height="30" - chrome="true" - auto_resize="true" - /> +<toolbar button_height="30" + pad_left="5" + pad_right="5" + pad_top="5" + pad_bottom="5" + pad_between="5" + mouse_opaque="false" + read_only="false"> + <button_panel name="button_panel" + bg_opaque_image="Rounded_Rect" + background_visible="true" + background_opaque="true"/> + <button_icon_and_text follows="left|top" + chrome="true" + image_overlay_alignment="left" + use_ellipses="true" + auto_resize="true"/> + <button_icon follows="left|top" + label="" + chrome="true" + use_ellipses="true" + auto_resize="true"/> </toolbar> |