1 files changed, 53 insertions, 4 deletions

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;