diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
commit | 015cf59c96a4613996fc34b898fe9751f27f9c8c (patch) | |
tree | 412a776e4bb8ae72960ea02d40ea7c98be1c1065 /indra/llcommon/lleventtimer.cpp | |
parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) | |
parent | b73291e9bd6a706c5c8913f1c40bd8324f772c4a (diff) |
merged .hgtags
Diffstat (limited to 'indra/llcommon/lleventtimer.cpp')
-rw-r--r-- | indra/llcommon/lleventtimer.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/indra/llcommon/lleventtimer.cpp b/indra/llcommon/lleventtimer.cpp index 7743826c60..0d96e03da4 100644 --- a/indra/llcommon/lleventtimer.cpp +++ b/indra/llcommon/lleventtimer.cpp @@ -58,19 +58,15 @@ LLEventTimer::~LLEventTimer() void LLEventTimer::updateClass() { std::list<LLEventTimer*> completed_timers; - + for (instance_iter iter = beginInstances(); iter != endInstances(); ) { - LLInstanceTrackerScopedGuard guard; - for (instance_iter iter = guard.beginInstances(); iter != guard.endInstances(); ) - { - LLEventTimer& timer = *iter++; - F32 et = timer.mEventTimer.getElapsedTimeF32(); - if (timer.mEventTimer.getStarted() && et > timer.mPeriod) { - timer.mEventTimer.reset(); - if ( timer.tick() ) - { - completed_timers.push_back( &timer ); - } + LLEventTimer& timer = *iter++; + F32 et = timer.mEventTimer.getElapsedTimeF32(); + if (timer.mEventTimer.getStarted() && et > timer.mPeriod) { + timer.mEventTimer.reset(); + if ( timer.tick() ) + { + completed_timers.push_back( &timer ); } } } |