1 files changed, 15 insertions, 1 deletions

diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 6077063..177f1de 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -525,13 +525,27 @@ LLEventTimer::~LLEventTimer()
 
 void LLEventTimer::updateClass() 
 {
+        std::list<LLEventTimer*> completed_timers;
         for (std::list<LLEventTimer*>::iterator iter = sActiveList.begin(); iter != sActiveList.end(); ) 
         {
                 LLEventTimer* timer = *iter++;
                 F32 et = timer->mEventTimer.getElapsedTimeF32();
                 if (et > timer->mPeriod) {
                         timer->mEventTimer.reset();
-                        timer->tick();
+                        if ( timer->tick() )
+                        {
+                                completed_timers.push_back( timer );
+                        }
+                }
+        }
+
+        if ( completed_timers.size() > 0 )
+        {
+                for (std::list<LLEventTimer*>::iterator completed_iter = completed_timers.begin(); 
+                         completed_iter != completed_timers.end(); 
+                         completed_iter++ ) 
+                {
+                        delete *completed_iter;
                 }
         }
 }