diff options
| author | Callum Prentice <callum@gmail.com> | 2017-04-21 14:32:13 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-04-21 14:32:13 -0700 |
| commit | 2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (patch) | |
| tree | ec40f2091563c690e06fb16d54b84d0e65bef39a /indra/newview/llinventorylistitem.h | |
| parent | 8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (diff) | |
| parent | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (diff) | |
Automated merge with tip of viewer64 (after it was merged with viewer-release)
Diffstat (limited to 'indra/newview/llinventorylistitem.h')
| -rw-r--r-- | indra/newview/llinventorylistitem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventorylistitem.h b/indra/newview/llinventorylistitem.h index b1ef6c74ee..d4dd212cc3 100644 --- a/indra/newview/llinventorylistitem.h +++ b/indra/newview/llinventorylistitem.h @@ -129,8 +129,8 @@ public: */ /*virtual*/ S32 notify(const LLSD& info); - /* Highlights item */ - /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); + /* Highlights item */ + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /* Removes item highlight */ /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); @@ -153,6 +153,7 @@ public: LLViewerInventoryItem* getItem() const; void setSeparatorVisible(bool visible) { mSeparatorVisible = visible; } + void resetHighlight() { mHovered = FALSE; } virtual ~LLPanelInventoryListItemBase(){} |