diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
| commit | 50ea915256d8c23c708a27154bb70e052c86ff51 (patch) | |
| tree | 8e7ab6d46c775e756ac27ebb0511eb3c33fa4e32 /indra/newview/llfasttimerview.cpp | |
| parent | fd2b0084bf92e34d35a9a7e3a90f15526f390927 (diff) | |
| parent | e15c97404f1e69745e055beea53aef67f5aa8ccc (diff) | |
merge changes for storm-1565
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 35712163eb..366154302c 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -252,7 +252,15 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) x < mBarEnd[mHoverBarIndex][i]) { mHoverID = (*it); - mHoverTimer = (*it); + if (mHoverTimer != *it) + { + // could be that existing tooltip is for a parent and is thus + // covering region for this new timer, go ahead and unblock + // so we can create a new tooltip + LLToolTipMgr::instance().unblockToolTips(); + mHoverTimer = (*it); + } + mToolTipRect.set(mBarStart[mHoverBarIndex][i], mBarRect.mBottom + llround(((F32)(MAX_VISIBLE_HISTORY - mHoverBarIndex + 1)) * ((F32)mBarRect.getHeight() / ((F32)MAX_VISIBLE_HISTORY + 2.f))), mBarEnd[mHoverBarIndex][i], |