3 files changed, 30 insertions, 24 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f1db72e5cc..9a06423422 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1858,7 +1858,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
     <key>Cursor3D</key>
     <map>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 947f0ec184..34ee893594 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1779,7 +1779,7 @@ void LLViewerWindow::initBase()
 	mHintHolder = main_view->getChild<LLView>("hint_holder")->getHandle();
 	mLoginPanelHolder = main_view->getChild<LLView>("login_panel_holder")->getHandle();
 
-	// Update the toolbar global holder
+	// Create the toolbar view
 	// *TODO: Eventually, suppress the existence of this debug setting and turn toolbar FUI on permanently
 	if (gSavedSettings.getBOOL("DebugToolbarFUI"))
 	{
@@ -1787,8 +1787,8 @@ void LLViewerWindow::initBase()
 		LLPanel* panel_holder = main_view->getChild<LLPanel>("toolbar_view_holder");
 		// Load the toolbar view from file 
 		gToolBarView = LLUICtrlFactory::getInstance()->createFromFile<LLToolBarView>("panel_toolbar_view.xml", panel_holder, LLDefaultChildRegistry::instance());
-		// Attach it to the toolbar view holder
-		//panel_holder->addChild(gToolBarView);
+		// Hide the toolbars for the moment: we'll make them visible after logging in world (see LLViewerWindow::initWorldUI())
+		gToolBarView->setVisible(FALSE);
 	}
 
 	// Constrain floaters to inside the menu and status bar regions.
@@ -1953,6 +1953,12 @@ void LLViewerWindow::initWorldUI()
 	buttons_panel->setShape(buttons_panel_container->getLocalRect());
 	buttons_panel->setFollowsAll();
 	buttons_panel_container->addChild(buttons_panel);
+
+	// Make the toolbars visible
+	if (gToolBarView)
+	{
+		gToolBarView->setVisible(TRUE);
+	}
 }
 
 // Destroy the UI
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 6701266887..7503da1d36 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -3,18 +3,32 @@
  follows="all"
  layout="topleft"
  name="toolbar view"
- height="500"
+ height="716"
  width="1024"
  left="0"
  top="0" 
  mouse_opaque="false"
  tab_stop="false"
  visible="true">
+ <panel
+  follows="top|bottom|left"
+  layout="topleft"
+  name="sizer_left"
+  height="686"
+  width="30"
+  left="0"
+  top="0" 
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_opaque_image="Toast_Over"
+  bg_alpha_image="Toast_Background"
+  visible="true" />
  <toolbar
   follows="top|bottom|left"
   layout="topleft"
   name="toolbar_left"
-  height="500"
+  height="686"
   width="30"
   left="0"
   top="0" 
@@ -26,9 +40,9 @@
   layout="topleft"
   name="toolbar_bottom"
   height="30"
-  width="964"
-  left="30"
-  top="470" 
+  width="1024"
+  left="0"
+  top="686" 
   side="bottom"
   button_display_mode="icons_with_text"
   visible="true" />
@@ -36,25 +50,11 @@
   follows="top|bottom|right"
   layout="topleft"
   name="toolbar_right"
-  height="500"
+  height="686"
   width="30"
   left="994"
   top="0" 
   side="right"
   button_display_mode="icons_only"
   visible="true" />
- <panel
-  follows="top|bottom|left"
-  layout="topleft"
-  name="sizer_left"
-  height="500"
-  width="30"
-  left="0"
-  top="0" 
-  background_opaque="false"
-  border_visible="false"
-  background_visible="true"
-  bg_opaque_image="Toast_Over"
-  bg_alpha_image="Toast_Background"
-  visible="true" />
 </toolbar_view>