From 068035959804d6a16a41ddb2ef62da00dceb2689 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 17:03:12 -0700
Subject: converted bad toolbars.xml file from error to warning

---
 indra/newview/lltoolbarview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 44b244f163..a0e080b783 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -152,7 +152,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	LLXMLNodePtr root;
 	if(!LLXMLNode::parseFile(toolbar_file, root, NULL))
 	{
-		llerrs << "Unable to load toolbars from file: " << toolbar_file << llendl;
+		llwarns << "Unable to load toolbars from file: " << toolbar_file << llendl;
 		return false;
 	}
 	if(!root->hasName("toolbars"))
-- 
cgit v1.2.3


From 6a570a9bdc2660e4db87e8e7a65b724e1ad8d1b2 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 17:52:37 -0700
Subject: fixed icons moving when clicking on icon-only toolbars

---
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 09967de7cc..be5dfaf18c 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -31,6 +31,8 @@
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
+               image_bottom_pad="10"
+               image_top_pad="10"
                image_pressed="PushButton_Press"
                image_pressed_selected="PushButton_Selected_Press"
                image_selected="PushButton_Selected_Press"
-- 
cgit v1.2.3