diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
| commit | dfbc6c65f665f5c550581b77aeb7c308181fd8d8 (patch) | |
| tree | e31a72c55ad0aa01728b90c861e2b91aa8c6b53b /indra/llui/lltoolbar.cpp | |
| parent | 831251785762897a72da2b4dc9fb62731491fe4d (diff) | |
| parent | 254728e00d600bdb4b211d9fd4b7da33e3872fea (diff) | |
merge changes for open-203
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); |