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/lltoolbar.cpp | |
| parent | 45a316831636043663972bdf83adbefb345549de (diff) | |
| parent | d5d7e264ad636a42470772f5e96914327e30eca2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index a1ea4ba18b..a75a1552fc 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -871,7 +871,10 @@ void LLToolBarButton::onMouseEnter(S32 x, S32 y, MASK mask) LLUICtrl::onMouseEnter(x, y, mask); // Always highlight toolbar buttons, even if they are disabled - mNeedsHighlight = TRUE; + if (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() == this) + { + mNeedsHighlight = TRUE; + } } void LLToolBarButton::onMouseCaptureLost() |