diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-11 17:11:57 -0400 |
| commit | dc6c486dea4ad16c3ed3130549ef8d04bc0c251b (patch) | |
| tree | 793505e141c1352a0b1a7dc2e8ff73407658bdaf /indra/llcommon/llfasttimer_class.cpp | |
| parent | 25d23fcbeb784e1f1312195d9ea31ad59ee81dc4 (diff) | |
| parent | 8c5da0552db39ba6031b76ffb08994e53217a559 (diff) | |
reconciled .hgtags
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 |