summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-09-22 17:36:04 -0700
committerRichard Linden <none@none>2011-09-22 17:36:04 -0700
commit0c5d69b662b97d7716c2b00baccd112eb1c6ec98 (patch)
tree111520a9d87a1d5af866f30c4a78d104da2747ff /indra/newview/skins/default/xui/en/widgets
parent565483ee1f2ea7b8d525c6d89700452216481c5e (diff)
parentc155483fc206768e21d180fac9ccdd85db8f582e (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/toolbar.xml23
1 files changed, 10 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..f9cc9b7c69 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,15 +1,12 @@
<?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 background_image = "Rounded_Rect"
+ button_height="30">
+ <button_icon_and_text follows="none"
+ chrome="true"
+ use_ellipses="true"
+ auto_resize="true"/>
+ <button_icon follows="none"
+ chrome="true"
+ use_ellipses="true"
+ auto_resize="true"/>
</toolbar>