summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-09-29 15:01:15 -0700
committerMerov Linden <merov@lindenlab.com>2011-09-29 15:01:15 -0700
commitb07e7c7198fbc78ca852b3ba48d516ec2901da21 (patch)
treeb7b2323439e2d3e5d32ce69c43540d1b38e454d3 /indra/newview/skins/default/xui/en
parent71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (diff)
EXP-1211, EXP-1257 : Save and load the button type along with the toolbars, add a force default load option, enforce consistency between menus and toolbars
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/menu_toolbars.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index de13fec670..59912b5503 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -12,11 +12,11 @@
<menu_item_separator layout="topleft" />
<menu_item_check label="Icons and labels"
layout="topleft"
- name="icons_and_labels">
+ name="icons_with_text">
<on_click function="Toolbars.EnableSetting"
- parameter="icons_and_labels" />
+ parameter="icons_with_text" />
<on_check function="Toolbars.CheckSetting"
- parameter="icons_and_labels" />
+ parameter="icons_with_text" />
</menu_item_check>
<menu_item_check label="Icons only"
layout="topleft"