From cdc80b1dd34ef533d7500bf1ab89abf3c5d81bb3 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 30 Sep 2011 15:25:02 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1268 FIX -- The "Restore
 Defaults" button should reset the left/right/bottom toolbars to their default
 states

* LLToolBarView::loadDefaultToolbars now a static function
* Toybox button callback hooked up to properly restore defaults

Reviewed by Merov
---
 indra/llui/lltoolbarview.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lltoolbarview.cpp')

diff --git a/indra/llui/lltoolbarview.cpp b/indra/llui/lltoolbarview.cpp
index 1c6cf3230b..12247519ad 100644
--- a/indra/llui/lltoolbarview.cpp
+++ b/indra/llui/lltoolbarview.cpp
@@ -114,7 +114,7 @@ bool LLToolBarView::addCommand(const LLCommandId& command, LLToolBar* toolbar)
 }
 
 bool LLToolBarView::loadToolbars(bool force_default)
-{	
+{
 	LLToolBarView::ToolbarSet toolbar_set;
 	
 	// Load the toolbars.xml file
@@ -204,6 +204,19 @@ bool LLToolBarView::loadToolbars(bool force_default)
 	return true;
 }
 
+//static
+bool LLToolBarView::loadDefaultToolbars()
+{
+	bool retval = false;
+
+	if (gToolBarView)
+	{
+		retval = gToolBarView->loadToolbars(true);
+	}
+
+	return retval;
+}
+
 void LLToolBarView::saveToolbars() const
 {
 	// Build the parameter tree from the toolbar data
-- 
cgit v1.2.3