diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-12 16:51:10 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-12 16:51:10 -0700 |
| commit | 17731c50a8ad2c465654db3cf88bcc2e885e2716 (patch) | |
| tree | b622c68a5dce0b8541010b41ebabd564342a6624 /indra/llui/llbutton.cpp | |
| parent | 45a316831636043663972bdf83adbefb345549de (diff) | |
| parent | d5d7e264ad636a42470772f5e96914327e30eca2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 0a7584a576..4f0c0d31bd 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -548,7 +548,7 @@ void LLButton::setHighlight(bool b) BOOL LLButton::handleHover(S32 x, S32 y, MASK mask) { if (isInEnabledChain() - && (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() != this)) + && (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() == this)) mNeedsHighlight = TRUE; if (!childrenHandleHover(x, y, mask)) |