aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerpartsource.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerpartsource.h')
-rw-r--r--linden/indra/newview/llviewerpartsource.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h
index 66de36b..15f7ba2 100644
--- a/linden/indra/newview/llviewerpartsource.h
+++ b/linden/indra/newview/llviewerpartsource.h
@@ -70,13 +70,16 @@ public:
70 LLVector3 mPosAgent; // Location of the particle source 70 LLVector3 mPosAgent; // Location of the particle source
71 LLVector3 mTargetPosAgent; // Location of the target position 71 LLVector3 mTargetPosAgent; // Location of the target position
72 LLVector3 mLastUpdatePosAgent; 72 LLVector3 mLastUpdatePosAgent;
73 LLPointer<LLViewerObject> mSourceObjectp;
74 U32 mID;
75
73protected: 76protected:
74 U32 mType; 77 U32 mType;
75 BOOL mIsDead; 78 BOOL mIsDead;
76 F32 mLastUpdateTime; 79 F32 mLastUpdateTime;
77 F32 mLastPartTime; 80 F32 mLastPartTime;
78 LLUUID mOwnerUUID; 81 LLUUID mOwnerUUID;
79 82
80 // Particle information 83 // Particle information
81 U32 mPartFlags; // Flags for the particle 84 U32 mPartFlags; // Flags for the particle
82}; 85};
@@ -115,7 +118,6 @@ public:
115protected: 118protected:
116 LLQuaternion mRotation; // Current rotation for particle source 119 LLQuaternion mRotation; // Current rotation for particle source
117 LLPointer<LLViewerImage> mImagep; // Cached image pointer of the mPartSysData UUID 120 LLPointer<LLViewerImage> mImagep; // Cached image pointer of the mPartSysData UUID
118 LLPointer<LLViewerObject> mSourceObjectp; // Source object that this particle system is attached to
119 LLPointer<LLViewerObject> mTargetObjectp; // Target object for the particle source 121 LLPointer<LLViewerObject> mTargetObjectp; // Target object for the particle source
120}; 122};
121 123
@@ -141,7 +143,6 @@ public:
141 LLColor4 mColor; 143 LLColor4 mColor;
142protected: 144protected:
143 LLPointer<LLViewerImage> mImagep; 145 LLPointer<LLViewerImage> mImagep;
144 LLPointer<LLViewerObject> mSourceObjectp;
145 LLVector3d mLKGSourcePosGlobal; 146 LLVector3d mLKGSourcePosGlobal;
146}; 147};
147 148
@@ -169,7 +170,6 @@ public:
169 170
170 static void updatePart(LLViewerPart &part, const F32 dt); 171 static void updatePart(LLViewerPart &part, const F32 dt);
171 LLPointer<LLViewerImage> mImagep; 172 LLPointer<LLViewerImage> mImagep;
172 LLPointer<LLViewerObject> mSourceObjectp;
173 LLPointer<LLViewerObject> mTargetObjectp; 173 LLPointer<LLViewerObject> mTargetObjectp;
174 LLVector3d mLKGTargetPosGlobal; 174 LLVector3d mLKGTargetPosGlobal;
175 LLColor4 mColor; 175 LLColor4 mColor;
@@ -199,7 +199,6 @@ public:
199 LLColor4 mColor; 199 LLColor4 mColor;
200protected: 200protected:
201 LLPointer<LLViewerImage> mImagep; 201 LLPointer<LLViewerImage> mImagep;
202 LLPointer<LLViewerObject> mSourceObjectp;
203 LLVector3d mLKGSourcePosGlobal; 202 LLVector3d mLKGSourcePosGlobal;
204}; 203};
205 204