diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-26 19:18:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-26 19:18:04 -0500 |
| commit | ced4ccdbd295216e57755b81b5b04df5b6022d4d (patch) | |
| tree | b0a7e694352b214dd098426846a0c9890c216d0e /indra/llui/lltoolbar.cpp | |
| parent | 45bc601563337b99ca3dc0d733196d7a00dd54d7 (diff) | |
| parent | fe3a9306233d8fddbbb7d961c398e51d49c29b42 (diff) | |
merge changes for storm-1984
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); |