diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
| commit | fe3a9306233d8fddbbb7d961c398e51d49c29b42 (patch) | |
| tree | 1875aa113b8b356b26eada5bb64cbf5b0d15824d /indra/llui/lltoolbar.cpp | |
| parent | 335810246253c04ac3c2ab4f5db556991ed717d6 (diff) | |
| parent | 52ec6f9af029797615a80e5a889572c18914d56e (diff) | |
merge fix 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); |