diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-12 17:50:03 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-12 17:50:03 -0700 |
| commit | 1181e7c75747361e1a57f083cf82c63ef152bfc5 (patch) | |
| tree | 03d41962e61ccbbe40d3dac843a0bfe74a81a3b4 /indra/llui/lltoolbar.cpp | |
| parent | 20358ea89dc9823ac0b539030fdf03268dbdf4e9 (diff) | |
| parent | 3e55263e33fde4ab1ff19e8cfcb55125ee42b70d (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 1320f03a25..541e01fb99 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -872,7 +872,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() |