diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-18 14:16:06 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-18 14:16:06 -0700 |
| commit | cc4e708848ce0be958353b8aa16d0c41c2a265bb (patch) | |
| tree | 71ef4fa6d4ff60510cf896e8c1667a6ff2e2ba15 /indra/newview/llfasttimerview.cpp | |
| parent | 64e3907853f4a2fba6f569b69d08a3f632d046e7 (diff) | |
| parent | e83cb4e9591befc00006c4ef8ac91f4445447042 (diff) | |
merge
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], |