summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-09-23 19:24:55 -0700
committerMerov Linden <merov@lindenlab.com>2011-09-23 19:24:55 -0700
commit105b15436d37149f6df71866125871448ee4fbcb (patch)
treeaa258070b5456629ea16e37f554984311bf51d84 /indra/newview/llviewerwindow.cpp
parente42a9ec70c0e5fc98282c98358039445d0d68b84 (diff)
EXP-1027 : Fix the children creation code in LLToolBarView. Only a left panel is displayed now.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
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);
}