diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
| commit | b8be8820ea52a77df6362179b1dda3fc4a305913 (patch) | |
| tree | 061d59de4c1ccca88aa82ec7381790581f90bee9 /indra/llcommon/llfasttimer_class.cpp | |
| parent | e0728065251fbd5f45218eb94c056a92162eb54d (diff) | |
| parent | a5769e81263d6d004033b914c1cbf1a8296923d9 (diff) | |
close head created by 54e071a92450
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index bd594b06cf..675eda2fc5 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -228,6 +228,14 @@ void LLFastTimer::DeclareTimer::updateCachedPointers() // update cached pointer it->mFrameState = &it->mTimer.getFrameState(); } + + // also update frame states of timers on stack
+ LLFastTimer* cur_timerp = LLFastTimer::sCurTimerData.mCurTimer;
+ while(cur_timerp->mLastTimerData.mCurTimer != cur_timerp)
+ {
+ cur_timerp->mFrameState = &cur_timerp->mFrameState->mTimer->getFrameState();
+ cur_timerp = cur_timerp->mLastTimerData.mCurTimer;
+ } } //static |