diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-12 16:17:24 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-12 16:17:24 -0700 |
| commit | 3594853d0ef166c98d04c015b1217f2a437f8872 (patch) | |
| tree | 591e927a45b317a8e8b9eb5f30154c71dd2c8b08 /indra/llui/lltoolbar.cpp | |
| parent | 9ca4b8219f1a18b11d457d6f18d3c695aba9aed2 (diff) | |
don't highlight toolbar buttons during drag and drop
added mVisibleWhenMinimized to floaters
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..02970bc969 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() |