From b07e7c7198fbc78ca852b3ba48d516ec2901da21 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 29 Sep 2011 15:01:15 -0700
Subject: 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

---
 indra/newview/skins/default/xui/en/menu_toolbars.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

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"
-- 
cgit v1.2.3