diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-28 16:23:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-28 16:23:04 -0700 |
| commit | 21543fdf26e8104d00bd683bdff5185d6dd620ef (patch) | |
| tree | e4ef0a2be82e16a6ac50c7eb87cd29b2afb2934e /indra/newview | |
| parent | 15f3ea39d7deb0c956b56703a94f6d072b7f2d21 (diff) | |
EXP-1257 : Implemented loading of toolbar settings per user account. Also factorize a bit and clean up the related saveToolbars code.
Diffstat (limited to 'indra/newview')
| -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); } } |