diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-20 18:46:34 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-20 18:46:34 -0700 |
| commit | f6ed8bfea62cbcbab8726f479b158513f8692c28 (patch) | |
| tree | 5f8bbd407df75bb5f1ce6f5ebc74e0bff3b3d5e6 /indra/llcommon | |
| parent | 1dfa63e73e29ccd1c5442a8984e5fcf4d3db5a65 (diff) | |
fix for crash when adding new fast timers
Diffstat (limited to 'indra/llcommon')
| -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 |