From 3642e401da6f4d7388ac0320989135a76fef7e4e Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 4 Apr 2014 19:57:32 -0400
Subject: [PATCH] Fix About and Toolbar prefs buttons being mushed together,
 thanks for the heads-up Friti!

---
 .../skins/default/xui/en-us/panel_toolbar.xml        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 667b1703f..534b86529 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -446,15 +446,15 @@
         <button.commit_callback function="ShowFloater" parameter="help tutorial"/>
       </button>
     </layout_panel>
-    <layout_panel name="panelabout" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleToolbarPrefs">
-      <button bottom="0" height="24" label="Change Buttons" name="change_buttons_btn" image_overlay="icn_toolbar_change_buttons.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
-        <button.commit_callback function="ShowFloater" parameter="floater_toolbar_prefs.xml"/>
-      </button>
-    </layout_panel>
-    <layout_panel name="panelabout" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleToolbarPrefs">
+    <layout_panel name="panelabout" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAbout">
       <button bottom="0" height="24" label="About [SHORT_APP_NAME]" name="about_btn" image_overlay="icn_toolbar_about_viewer.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
         <button.commit_callback function="ShowFloater" parameter="about"/>
       </button>
     </layout_panel>
+    <layout_panel name="paneltoolbarprefs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleToolbarPrefs">
+      <button bottom="0" height="24" label="Change Buttons" name="change_buttons_btn" image_overlay="icn_toolbar_change_buttons.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="floater_toolbar_prefs.xml"/>
+      </button>
+    </layout_panel>
   </layout_stack>
 </panel>