Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

5 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 19dec78c63..a9345b3b0a 100644
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toolbars>
   <bottom_toolbar
-    button_display_mode="0">
+    button_display_mode="icons_with_text">
     <command name="chat"/>
     <command name="speak"/>
     <command name="places"/>
@@ -12,7 +12,7 @@
     <command name="howto"/>
   </bottom_toolbar>
   <left_toolbar
-    button_display_mode="1">
+    button_display_mode="icons_only">
     <command name="avatar"/>
     <command name="inventory"/>
     <command name="snapshot"/>
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 5822f682df..2ea2f608cc 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -184,8 +184,8 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	{
 		if (toolbar_set.left_toolbar.button_display_mode.isProvided())
 		{
-			U32 button_type = toolbar_set.left_toolbar.button_display_mode;
-			mToolbarLeft->setButtonType((LLToolBarEnums::ButtonType)(button_type));
+			LLToolBarEnums::ButtonType button_type = toolbar_set.left_toolbar.button_display_mode;
+			mToolbarLeft->setButtonType(button_type);
 		}
 		BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.left_toolbar.commands)
 		{
@@ -196,8 +196,8 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	{
 		if (toolbar_set.right_toolbar.button_display_mode.isProvided())
 		{
-			U32 button_type = toolbar_set.right_toolbar.button_display_mode;
-			mToolbarRight->setButtonType((LLToolBarEnums::ButtonType)(button_type));
+			LLToolBarEnums::ButtonType button_type = toolbar_set.right_toolbar.button_display_mode;
+			mToolbarRight->setButtonType(button_type);
 		}
 		BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.right_toolbar.commands)
 		{
@@ -208,8 +208,8 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	{
 		if (toolbar_set.bottom_toolbar.button_display_mode.isProvided())
 		{
-			U32 button_type = toolbar_set.bottom_toolbar.button_display_mode;
-			mToolbarBottom->setButtonType((LLToolBarEnums::ButtonType)(button_type));
+			LLToolBarEnums::ButtonType button_type = toolbar_set.bottom_toolbar.button_display_mode;
+			mToolbarBottom->setButtonType(button_type);
 		}
 		BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.bottom_toolbar.commands)
 		{
@@ -238,17 +238,17 @@ void LLToolBarView::saveToolbars() const
 	LLToolBarView::ToolbarSet toolbar_set;
 	if (mToolbarLeft)
 	{
-		toolbar_set.left_toolbar.button_display_mode = (int)(mToolbarLeft->getButtonType());
+		toolbar_set.left_toolbar.button_display_mode = mToolbarLeft->getButtonType();
 		addToToolset(mToolbarLeft->getCommandsList(),toolbar_set.left_toolbar);
 	}
 	if (mToolbarRight)
 	{
-		toolbar_set.right_toolbar.button_display_mode = (int)(mToolbarRight->getButtonType());
+		toolbar_set.right_toolbar.button_display_mode = mToolbarRight->getButtonType();
 		addToToolset(mToolbarRight->getCommandsList(),toolbar_set.right_toolbar);
 	}
 	if (mToolbarBottom)
 	{
-		toolbar_set.bottom_toolbar.button_display_mode = (int)(mToolbarBottom->getButtonType());
+		toolbar_set.bottom_toolbar.button_display_mode = mToolbarBottom->getButtonType();
 		addToToolset(mToolbarBottom->getCommandsList(),toolbar_set.bottom_toolbar);
 	}
 	
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index b7d3a4033a..dc27fc2ffa 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -50,7 +50,7 @@ public:
 	// the user folder for the user specific (saved) settings
 	struct Toolbar : public LLInitParam::Block<Toolbar>
 	{
-		Mandatory<U32>                button_display_mode;
+		Mandatory<LLToolBarEnums::ButtonType>	button_display_mode;
 		Multiple<LLCommandId::Params>	commands;
 		Toolbar();
 	};
@@ -73,7 +73,7 @@ public:
 	bool loadToolbars(bool force_default = false);	// return false if load fails
 	
 	static bool loadDefaultToolbars();
-
+	
 	static void startDragItem( S32 x, S32 y, const LLUUID& uuid);
 	static BOOL handleDragItem( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
 	static BOOL handleDrop(	EDragAndDropType cargo_type, void* cargo_data, const LLUUID& folder_id);
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index de39032cbf..972ae1487a 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -48,8 +48,8 @@
     button_display_mode="icons_with_text"
     follows="all"
     left="20"
-    button_icon_and_text.max_button_width="140"
-    button_icon_and_text.min_button_width="70"
+    button_icon_and_text.button_width.max="140"
+    button_icon_and_text.button_width.min="70"
     name="toybox_toolbar"
     pad_left="5"
     pad_right="5"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 8422e3943d..0c7e7cff56 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -12,8 +12,8 @@
                 bg_opaque_image_overlay="MouseGray"
                 background_opaque="true"/>
   <button_icon_and_text imgoverlay_label_space="7"
-                        min_button_width="70"
-                        max_button_width="140"
+                        button_width.min="70"
+                        button_width.max="140"
                         desired_height="24"
                         pad_left="10" 
                         pad_right="10"
@@ -25,8 +25,8 @@
   <button_icon pad_left="10"
                pad_right="10"
                desired_height="35"
-               min_button_width="35"
-               max_button_width="35"               
+               button_width.min="35"
+               button_width.max="35"               
                follows="left|top"
                label=""
                chrome="true"