diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/llui/lltoolbar.cpp | |
parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge with viewer-release
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rwxr-xr-x | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 6bfe113933..928e82cb8c 100755 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -928,8 +928,6 @@ 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); |