diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
| commit | 0f86c26fa5c7c774e43189dd5ef5d68cb81e6dbf (patch) | |
| tree | 67f26cd98a492f0aff9d4ccb9a276221fdbc5e3a /indra/llcommon/llfasttimer_class.cpp | |
| parent | 6df418b7af8b8088f72089dc11401db455c26e13 (diff) | |
| parent | 26a9a6929c23eabfef0a53355a392fef0ad26b83 (diff) | |
merge
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 |