diff options
| author | Richard Linden <none@none> | 2013-01-27 21:35:20 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-27 21:35:20 -0800 |
| commit | 2c68d5367c5c44aceb4ff23d9672c35642e030f7 (patch) | |
| tree | 0d7811ecbf75f552cae0f7b5228c6bf5fd711184 /indra/llcommon/llfasttimer.cpp | |
| parent | 09ee16c61d372c1eb620bc3ef3dbfeb798c0a82e (diff) | |
SH-3275 WIP interesting Update viewer metrics system to be more flexible
fixed memory leak
fixed glitching of fast timer display
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index a144a8c94e..e58c5c0f98 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -425,6 +425,13 @@ void TimeBlockAccumulator::reset( const TimeBlockAccumulator* other ) mTotalTimeCounter = 0; mChildTimeCounter = 0; mCalls = 0; + if (other) + { + mLastCaller = other->mLastCaller; + mActiveCount = other->mActiveCount; + mMoveUpTree = other->mMoveUpTree; + mParent = other->mParent; + } } } // namespace LLTrace |