From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Wed, 27 Feb 2008 18:58:14 +0000 Subject: Merge of windlight into release (QAR-286). This includes all changes in windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 --- indra/newview/llviewerpartsource.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llviewerpartsource.h') diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h index 3e3e63c2fb..7a49a919bc 100644 --- a/indra/newview/llviewerpartsource.h +++ b/indra/newview/llviewerpartsource.h @@ -73,6 +73,7 @@ public: LLUUID getOwnerUUID() const { return mOwnerUUID; } U32 getID() const { return mID; } LLUUID getImageUUID() const; + void setStart() ; LLVector3 mPosAgent; // Location of the particle source LLVector3 mTargetPosAgent; // Location of the target position @@ -91,6 +92,7 @@ protected: // Particle information U32 mPartFlags; // Flags for the particle + U32 mDelay ; //delay to start particles }; -- cgit v1.2.3