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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/newview/llinventorylistitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index 0601796436..12bb609df8 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -182,10 +182,10 @@ void LLPanelInventoryListItemBase::setValue(const LLSD& value) mSelected = value["selected"]; } -void LLPanelInventoryListItemBase::onMouseEnter(S32 x, S32 y, MASK mask) +BOOL LLPanelInventoryListItemBase::handleHover(S32 x, S32 y, MASK mask) { mHovered = true; - LLPanel::onMouseEnter(x, y, mask); + return LLPanel::handleHover(x, y, mask); } void LLPanelInventoryListItemBase::onMouseLeave(S32 x, S32 y, MASK mask) |