diff options
author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/llui/lltabcontainer.h | |
parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/llui/lltabcontainer.h')
-rwxr-xr-x | indra/llui/lltabcontainer.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h index 7e7d4ac6e6..57862fc626 100755 --- a/indra/llui/lltabcontainer.h +++ b/indra/llui/lltabcontainer.h @@ -62,15 +62,12 @@ public: Optional<LLUIImage*> tab_top_image_unselected, tab_top_image_selected, tab_top_image_flash, - tab_top_image_hovered, tab_bottom_image_unselected, tab_bottom_image_selected, tab_bottom_image_flash, - tab_bottom_image_hovered, tab_left_image_unselected, tab_left_image_selected, - tab_left_image_flash, - tab_left_image_hovered; + tab_left_image_flash; TabParams(); }; @@ -117,11 +114,6 @@ public: */ Optional<S32> tab_icon_ctrl_pad; - /** - * This variable is used to found out should we highlight tab button on hover - */ - Optional<bool> use_highlighting_on_hover; - Params(); }; @@ -315,7 +307,6 @@ private: bool mOpenTabsOnDragAndDrop; S32 mTabIconCtrlPad; bool mUseTabEllipses; - bool mUseHighlightingOnHover; }; #endif // LL_TABCONTAINER_H |