diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:13:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:13:01 -0700 |
| commit | 40ebe180a6592381804555d1c9e8df84bf35345a (patch) | |
| tree | 523d687dedb2921d30e1d553184a8caa87ee3c45 /indra/llui/lltoolbar.cpp | |
| parent | aa1f0215c764fa346625ace43c467a0e0f803057 (diff) | |
| parent | 1181e7c75747361e1a57f083cf82c63ef152bfc5 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index ce3ef1db97..21eeed1d27 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -99,6 +99,7 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p) mSideType(p.side), mWrap(p.wrap), mNeedsLayout(false), + mModified(false), mButtonPanel(NULL), mCenteringStack(NULL), mPadLeft(p.pad_left), @@ -909,7 +910,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() |