4 files changed, 93 insertions, 21 deletions

diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 306b357d6a..6be616b980 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -72,9 +72,15 @@ LLCommandManager::LLCommandManager()
 
 LLCommandManager::~LLCommandManager()
 {
+	for (CommandVector::iterator cmdIt = mCommands.begin(); cmdIt != mCommands.end(); ++cmdIt)
+	{
+		LLCommand * command = *cmdIt;
+
+		delete command;
+	}
 }
 
-U32 LLCommandManager::count() const
+U32 LLCommandManager::commandCount() const
 {
 	return mCommands.size();
 }
@@ -88,20 +94,24 @@ LLCommand * LLCommandManager::getCommand(const std::string& commandName)
 {
 	LLCommand * command_name_match = NULL;
 
-	for (CommandVector::iterator it = mCommands.begin(); it != mCommands.end(); ++it)
+	CommandIndexMap::const_iterator found = mCommandIndices.find(commandName);
+	
+	if (found != mCommandIndices.end())
 	{
-		LLCommand * command = *it;
-
-		if (command->name() == commandName)
-		{
-			command_name_match = command;
-			break;
-		}
+		command_name_match = mCommands[found->second];
 	}
 
 	return command_name_match;
 }
 
+void LLCommandManager::addCommand(LLCommand * command)
+{
+	mCommandIndices[command->name()] = mCommands.size();
+	mCommands.push_back(command);
+
+	llinfos << "Successfully added command: " << command->name() << llendl;
+}
+
 //static
 bool LLCommandManager::load()
 {
@@ -129,9 +139,7 @@ bool LLCommandManager::load()
 	{
 		LLCommand * command = new LLCommand(commandParams);
 
-		mgr.mCommands.push_back(command);
-
-		llinfos << "Successfully loaded command: " << command->name() << llendl;
+		mgr.addCommand(command);
 	}
 
 	return true;
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 4f3c9b2ada..24378ecd62 100644
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_COMMANDMANAGER_H
-#define LL_COMMANDMANAGER_H
+#ifndef LL_LLCOMMANDMANAGER_H
+#define LL_LLCOMMANDMANAGER_H
 
 #include "llinitparam.h"
 #include "llsingleton.h"
@@ -82,16 +82,22 @@ public:
 	LLCommandManager();
 	~LLCommandManager();
 
-	U32 count() const;
+	U32 commandCount() const;
 	LLCommand * getCommand(U32 commandIndex);
 	LLCommand * getCommand(const std::string& commandName);
 
 	static bool load();
 
+protected:
+	void addCommand(LLCommand * command);
+
 private:
+	typedef std::map<std::string, U32>	CommandIndexMap;
 	typedef std::vector<LLCommand *>	CommandVector;
-	CommandVector						mCommands;
+	
+	CommandVector	mCommands;
+	CommandIndexMap	mCommandIndices;
 };
 
 
-#endif // LL_COMMANDMANAGER_H
+#endif // LL_LLCOMMANDMANAGER_H
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index e10a254197..b2cf7e6554 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -27,9 +27,12 @@
 
 #include "linden_common.h"
 
-#include "boost/foreach.hpp"
+#include <boost/foreach.hpp>
 #include "lltoolbar.h"
 
+#include "llcommandmanager.h"
+#include "lltrans.h"
+
 // uncomment this and remove the one in llui.cpp when there is an external reference to this translation unit
 // thanks, MSVC!
 //static LLDefaultChildRegistry::Register<LLToolBar> r1("toolbar");
@@ -76,6 +79,8 @@ LLToolBar::LLToolBar(const Params& p)
 	mButtonHeight(p.button_height),
 	mBackgroundImage(p.background_image)
 {
+	mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_ONLY] = p.button_icon;
+	mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_WITH_TEXT] = p.button_icon_and_text;
 }
 
 void LLToolBar::initFromParams(const LLToolBar::Params& p)
@@ -114,9 +119,7 @@ void LLToolBar::initFromParams(const LLToolBar::Params& p)
 	{
 		// buttons always follow left and top, for all orientations
 		button_p.follows.flags = FOLLOWS_LEFT|FOLLOWS_TOP;
-		button_p.fillFrom((mButtonType == BTNTYPE_ICONS_ONLY)
-							? p.button_icon						// icon only
-							: p.button_icon_and_text);			// icon + text
+		button_p.fillFrom(mButtonParams[mButtonType]);
 
 		LLRect button_rect(button_p.rect);
 		{ // remove any offset from button
@@ -157,6 +160,52 @@ void LLToolBar::resizeButtonsInRow(std::vector<LLToolBarButton*>& buttons_in_row
 	}
 }
 
+bool LLToolBar::addCommand(LLCommand * command)
+{
+	//
+	// Init basic toolbar button params
+	//
+
+	LLToolBarButton::Params button_p;
+	button_p.fillFrom(mButtonParams[mButtonType]);
+
+	button_p.name = command->name();
+	button_p.label = LLTrans::getString(command->labelRef());
+	button_p.tool_tip = LLTrans::getString(command->tooltipRef());
+
+	//
+	// Set up the button rectangle
+	//
+
+	S32 btn_width = mMinButtonWidth;
+	S32 btn_height = mButtonParams[mButtonType].rect.height;
+
+	if ((mSideType == LLToolBarEnums::SIDE_BOTTOM) || (mSideType == LLToolBarEnums::SIDE_TOP))
+	{
+		btn_height = getRect().getHeight();
+	}
+
+	LLRect button_rect;
+	button_rect.setOriginAndSize(0, 0, btn_width, btn_height);
+
+	button_p.rect = button_rect;
+
+	//
+	// Add it to the list of buttons
+	//
+
+	LLToolBarButton * toolbar_button = LLUICtrlFactory::create<LLToolBarButton>(button_p);
+
+	toolbar_button->reshape(llclamp(toolbar_button->getRect().getWidth(), mMinButtonWidth, mMaxButtonWidth), toolbar_button->getRect().getHeight());
+
+	mButtons.push_back(toolbar_button);
+	mCenterPanel->addChild(toolbar_button);
+
+	mNeedsLayout = true;
+
+	return true;
+}
+
 void LLToolBar::updateLayoutAsNeeded()
 {
 	if (!mNeedsLayout) return;
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 83e482a946..9b08b26ce4 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -33,6 +33,9 @@
 #include "llbutton.h"
 
 
+class LLCommand;
+
+
 class LLToolBarButton : public LLButton
 {
 public:
@@ -50,6 +53,8 @@ namespace LLToolBarEnums
 	{
 		BTNTYPE_ICONS_ONLY = 0,
 		BTNTYPE_ICONS_WITH_TEXT,
+
+		BTNTYPE_COUNT
 	};
 
 	enum SideType
@@ -108,6 +113,8 @@ public:
 	void draw();
 	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
+	bool addCommand(LLCommand * command);
+
 protected:
 	friend class LLUICtrlFactory;
 	LLToolBar(const Params&);
@@ -132,6 +139,8 @@ private:
 									mButtonHeight;
 
 	LLUIImagePtr					mBackgroundImage;
+
+	LLToolBarButton::Params			mButtonParams[LLToolBarEnums::BTNTYPE_COUNT];
 };