diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
commit | da0b5fe998434a935027b5e7cca2b70b895f0673 (patch) | |
tree | 538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/llviewerwindow.cpp | |
parent | d7400ae60c0453e111357abfb09d8308adf8b721 (diff) | |
parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) |
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ee2171fb07..8bdab7d27a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1923,7 +1923,7 @@ void LLViewerWindow::initWorldUI() LLPanelStandStopFlying* panel_stand_stop_flying = LLPanelStandStopFlying::getInstance(); panel_ssf_container->addChild(panel_stand_stop_flying); panel_ssf_container->setVisible(TRUE); - + // Load and make the toolbars visible // Note: we need to load the toolbars only *after* the user is logged in and IW if (gToolBarView) |