diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-20 18:54:50 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-20 18:54:50 -0700 |
| commit | 7d9fff968dae9c70f0094cbdbc96d6733adaa48a (patch) | |
| tree | 0ecec634e0e0ac4df04a47ccd43cd614f6577118 | |
| parent | 85370eed51df59c83a1a54822d6e9651ac13382f (diff) | |
| parent | f6ed8bfea62cbcbab8726f479b158513f8692c28 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index bd594b06cf..1dfc194d7c 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -228,6 +228,13 @@ 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 |