From 21543fdf26e8104d00bd683bdff5185d6dd620ef Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 Sep 2011 16:23:04 -0700
Subject: EXP-1257 : Implemented loading of toolbar settings per user account.
 Also factorize a bit and clean up the related saveToolbars code.

---
 indra/newview/llviewerwindow.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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);
 	}
 }
-- 
cgit v1.2.3