summaryrefslogtreecommitdiff
path: root/indra/llui/lltoolbar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
committerOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
commitdec487cd7f04f00d4aa6428d190ffbf978ea57da (patch)
treed96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/llui/lltoolbar.cpp
parentc9775dde6249582f0e8976be15e72bfebc4ac3fc (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-release
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rwxr-xr-xindra/llui/lltoolbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 928e82cb8c..6bfe113933 100755
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -928,6 +928,8 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id)
button_p.label = LLTrans::getString(commandp->labelRef());
button_p.tool_tip = LLTrans::getString(commandp->tooltipRef());
button_p.image_overlay = LLUI::getUIImage(commandp->icon());
+ button_p.image_hover_unselected = LLUI::getUIImage(commandp->hoverIconUnselected());
+ button_p.image_hover_selected = LLUI::getUIImage(commandp->hoverIconSelected());
button_p.button_flash_enable = commandp->isFlashingAllowed();
button_p.overwriteFrom(mButtonParams[mButtonType]);
LLToolBarButton* button = LLUICtrlFactory::create<LLToolBarButton>(button_p);