From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release

---
 indra/newview/llviewerpartsource.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llviewerpartsource.cpp')

diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index 01c835dbf0..96e8863ec8 100644
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -27,6 +27,7 @@ LLViewerPartSource::LLViewerPartSource(const U32 type) :
 	mLastUpdateTime = 0.f;
 	mLastPartTime = 0.f;
 	mIsDead = FALSE;
+	mIsSuspended = FALSE;
 	static U32 id_seed = 0;
 	mID = ++id_seed;
 }
@@ -73,6 +74,9 @@ void LLViewerPartSourceScript::setDead()
 
 void LLViewerPartSourceScript::update(const F32 dt)
 {
+	if( mIsSuspended )
+		return;
+
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
 	F32 old_update_time = mLastUpdateTime;
 	mLastUpdateTime += dt;
-- 
cgit v1.3