diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-28 16:55:10 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-28 16:55:10 -0700 |
| commit | 71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (patch) | |
| tree | 8e34bff5a8285d41fdc7e59f18b5758ac9df87f8 /indra/newview/llviewerwindow.cpp | |
| parent | fdf042bdb9aeefa209694e04d4012a3a1f911a52 (diff) | |
| parent | 2a459e1060255d0334ab5ed73c0deaa93015cafc (diff) | |
Merge with latest
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 7c930b80c2..6c9ee17a76 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1950,9 +1950,11 @@ void LLViewerWindow::initWorldUI() buttons_panel->setFollowsAll(); buttons_panel_container->addChild(buttons_panel); - // Make the toolbars visible + // Load and make the toolbars visible + // Note: we need to load the toolbars only *after* the user is logged in and IW if (gToolBarView) { + gToolBarView->loadToolbars(); gToolBarView->setVisible(TRUE); } } |