diff options
| author | Richard Linden <none@none> | 2013-08-19 16:06:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-19 16:06:05 -0700 |
| commit | cbaaf4fbdf4d8c80e07b97d17788f1ec6b784d5d (patch) | |
| tree | 3d7f65cae0d4a048c2cd22c6b2df485bb8a0dbf0 /indra/newview | |
| parent | 1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (diff) | |
| parent | 9c256611f1814b843e1adc29f8a9185a3519eeaf (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfasttimerview.cpp | 12 | ||||
| -rwxr-xr-x | indra/newview/llfasttimerview.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 36cbd67333..e8db263fae 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -282,14 +282,14 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) } if (hover_bar) - { + { mHoverID = hover_bar->mTimeBlock; if (mHoverTimer != mHoverID) - { - // 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(); + { + // 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 = mHoverID; mToolTipRect.set(mBarRect.mLeft + (hover_bar->mSelfStart / mTotalTimeDisplay) * mBarRect.getWidth(), row.mTop, diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index d184aae03d..8c2c939c5e 100755 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -128,7 +128,7 @@ private: DISPLAY_HZ } mDisplayType; bool mPauseHistory; - F64Seconds mAllTimeMax, + F64Seconds mAllTimeMax, mTotalTimeDisplay; S32 mScrollIndex, mHoverBarIndex, |