diff options
| author | Aura Linden <aura@lindenlab.com> | 2011-07-21 17:07:57 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2011-07-21 17:07:57 -0700 |
| commit | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (patch) | |
| tree | 5242c2011c3425ef624c3f6ce59f1ce12930edae /indra/llcommon/llfasttimer_class.cpp | |
| parent | 6d789f59f8d8b3d195090f972f783727037790c2 (diff) | |
| parent | 8d9901718022f34e9eb93c339dda796da52d0545 (diff) | |
Added handling for RemoveInventoryObjects message. Fixed handling of RemoveInventoryFolder
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
| -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 |