diff options
| author | leyla_linden <none@none> | 2011-10-12 17:19:25 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-10-12 17:19:25 -0700 |
| commit | 3e55263e33fde4ab1ff19e8cfcb55125ee42b70d (patch) | |
| tree | aa0cc3194a64b976d99e532d83addb2c942c7fda /indra/llui/lltoolbar.cpp | |
| parent | fbd883ab36e49fea76b16a04aad0be5fc5196d49 (diff) | |
| parent | 17731c50a8ad2c465654db3cf88bcc2e885e2716 (diff) | |
Merge
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() |