diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
tree | 214b852c8451409d5d355437ddad48199bef976a /indra/llui/lltoolbar.cpp | |
parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) |
Merge with viewer-bear
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rwxr-xr-x | indra/llui/lltoolbar.cpp | 2 |
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); |