From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 12 Aug 2008 17:29:50 +0000
Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge
 release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated

---
 indra/llcommon/lltimer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/lltimer.cpp')

diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 77d683adc0..7570420d2c 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -538,7 +538,7 @@ void LLEventTimer::updateClass()
 	{
 		LLEventTimer* timer = *iter++;
 		F32 et = timer->mEventTimer.getElapsedTimeF32();
-		if (et > timer->mPeriod) {
+		if (timer->mEventTimer.getStarted() && et > timer->mPeriod) {
 			timer->mEventTimer.reset();
 			if ( timer->tick() )
 			{
-- 
cgit v1.2.3