Second Life viewer sources 1.18.4.0-RC

1 files changed, 7 insertions, 6 deletions

diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h
index 32e1475..3e3e63c 100644
--- a/linden/indra/newview/llviewerpartsource.h
+++ b/linden/indra/newview/llviewerpartsource.h
@@ -2,6 +2,8 @@
  * @file llviewerpartsource.h
  * @brief LLViewerPartSource class header file
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLVIEWERPARTSOURCE_H
@@ -68,6 +71,8 @@ public:
         static void updatePart(LLViewerPart &part, const F32 dt);
         void setOwnerUUID(const LLUUID& owner_id) { mOwnerUUID = owner_id; }
         LLUUID getOwnerUUID() const { return mOwnerUUID; }
+        U32     getID() const { return mID; }
+        LLUUID getImageUUID() const;
 
         LLVector3       mPosAgent; // Location of the particle source
         LLVector3       mTargetPosAgent; // Location of the target position
@@ -82,7 +87,8 @@ protected:
         F32                     mLastUpdateTime;
         F32                     mLastPartTime;
         LLUUID          mOwnerUUID;
-        
+        LLPointer<LLViewerImage>        mImagep;
+
         // Particle information
         U32                     mPartFlags; // Flags for the particle
 };
@@ -120,7 +126,6 @@ public:
 
 protected:
         LLQuaternion                            mRotation;                      // Current rotation for particle source
-        LLPointer<LLViewerImage>        mImagep;                        // Cached image pointer of the mPartSysData UUID
         LLPointer<LLViewerObject>       mTargetObjectp;         // Target object for the particle source
 };
 
@@ -145,7 +150,6 @@ public:
         static void updatePart(LLViewerPart &part, const F32 dt);
         LLColor4 mColor;
 protected:
-        LLPointer<LLViewerImage>        mImagep;
         LLVector3d mLKGSourcePosGlobal;
 };
 
@@ -171,7 +175,6 @@ public:
         void setColor(const LLColor4 &color);
 
         static void updatePart(LLViewerPart &part, const F32 dt);
-        LLPointer<LLViewerImage>        mImagep;
         LLPointer<LLViewerObject>       mTargetObjectp;
         LLVector3d              mLKGTargetPosGlobal;
         LLColor4 mColor;
@@ -197,11 +200,9 @@ public:
 
         void setSourceObject(LLViewerObject *objp);
         void setColor(const LLColor4 &color);
-
         static void updatePart(LLViewerPart &part, const F32 dt);
         LLColor4 mColor;
 protected:
-        LLPointer<LLViewerImage>        mImagep;
         LLVector3d mLKGSourcePosGlobal;
 };