merge -r62831:64079 branches/maintenance to release

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h
index 30ea00809a..807f73e2ab 100644
--- a/indra/newview/llviewerpartsource.h
+++ b/indra/newview/llviewerpartsource.h
@@ -41,9 +41,10 @@ public:
 	virtual void update(const F32 dt); // Return FALSE if this source is dead...
 
 	virtual void setDead();
-	BOOL isDead() const			{ return mIsDead; }
-
-	U32 getType() const			{ return mType; }
+	BOOL isDead() const				{ return mIsDead; }
+	void setSuspended( BOOL state )	{ mIsSuspended = state; }
+	BOOL isSuspended() const		{ return mIsSuspended; }
+	U32 getType() const				{ return mType; }
 	static void updatePart(LLViewerPart &part, const F32 dt);
 	void setOwnerUUID(const LLUUID& owner_id) { mOwnerUUID = owner_id; }
 	LLUUID getOwnerUUID() const { return mOwnerUUID; }
@@ -57,6 +58,7 @@ public:
 protected:
 	U32			mType;
 	BOOL		mIsDead;
+	BOOL		mIsSuspended;
 	F32			mLastUpdateTime;
 	F32			mLastPartTime;
 	LLUUID		mOwnerUUID;