diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-21 18:49:16 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-21 18:49:16 -0700 |
| commit | d0d87e450f408af14e0c3d5963645333d60e828b (patch) | |
| tree | 6d6cad98c02cefc8b8b367032e356f3f72254772 /indra/newview/skins/default | |
| parent | cdedc4ab99444a48dc27d4a8fb48c7af043d377c (diff) | |
| parent | d9b96097cd67f1d72410c262973ac67fd0f82493 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 15 |
2 files changed, 18 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml index 76bba4e72e..138322eca7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -14,14 +14,11 @@ left="0" top="20" side="top"> - <button width="0" - auto_resize="true" + <button auto_resize="true" label="Button 1"/> - <button width="0" - auto_resize="true" + <button auto_resize="true" label="Button with long label"/> - <button width="0" - auto_resize="true" + <button auto_resize="true" label="Button with longest label of all"/> </toolbar> <toolbar name="test_toolbar_vertical" diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml new file mode 100644 index 0000000000..a7f73c0c7c --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -0,0 +1,15 @@ +<?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> |