From 105b15436d37149f6df71866125871448ee4fbcb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 23 Sep 2011 19:24:55 -0700
Subject: EXP-1027 : Fix the children creation code in LLToolBarView. Only a
 left panel is displayed now.

---
 indra/newview/llviewerwindow.cpp                          | 2 +-
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e851398bf5..c651e86606 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1786,7 +1786,7 @@ void LLViewerWindow::initBase()
 		// Get a pointer to the toolbar view holder
 		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, LLPanel::child_registry_t::instance());
+		gToolBarView = LLUICtrlFactory::getInstance()->createFromFile<LLToolBarView>("panel_toolbar_view.xml", panel_holder, LLDefaultChildRegistry::instance());
 		// Attach it to the toolbar view holder
 		//panel_holder->addChild(gToolBarView);
 	}
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 33a19bcdb0..12c442d8f1 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -5,6 +5,8 @@
  name="toolbar view"
  height="500"
  width="1024"
+ left="0"
+ top="0" 
  mouse_opaque="false"
  tab_stop="false"
  visible="true">
@@ -39,7 +41,7 @@
   side="right"
   visible="true" />
  <panel
-  follows="right|bottom|left"
+  follows="top|bottom|left"
   layout="topleft"
   name="sizer_left"
   height="500"
-- 
cgit v1.2.3