diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-25 11:56:49 -0400 |
| commit | 6a15da0133aac12f3223d91078d133d50e7d44ee (patch) | |
| tree | fadafea4c31ed6c56560cd2126214486a231ab6d /indra/llcommon/llfasttimer_class.cpp | |
| parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff) | |
| parent | 723d05e6df1d89b8957aca429b1328834f323150 (diff) | |
merged .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 |