Second Life viewer sources 1.14.0.0

1 files changed, 21 insertions, 13 deletions

diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index 7983838..c1ef43b 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -50,7 +50,7 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt);
 //
 
 
-class LLViewerPart : public LLPartData
+class LLViewerPart : public LLPartData, public LLRefCount
 {
 public:
         LLViewerPart();
@@ -90,19 +90,26 @@ public:
 
         void cleanup();
 
-        BOOL addPart(LLViewerPart &part);
+        BOOL addPart(LLViewerPart* part, const F32 desired_size = -1.f);
         
         void updateParticles(const F32 dt);
 
-        BOOL posInGroup(const LLVector3 &pos);
+        BOOL posInGroup(const LLVector3 &pos, const F32 desired_size = -1.f);
 
         void shift(const LLVector3 &offset);
 
-        LLDynamicArray<LLViewerPart> mParticles;
+        typedef std::vector<LLPointer<LLViewerPart> > part_list_t;
+        part_list_t mParticles;
 
         const LLVector3 &getCenterAgent() const         { return mCenterAgent; }
-        S32 getCount() const                                    { return mParticles.count(); }
+        S32 getCount() const                                    { return (S32) mParticles.size(); }
         LLViewerRegion *getRegion() const               { return mRegionp; }
+
+        LLPointer<LLVOPartGroup> mVOPartGroupp;
+
+        BOOL mUniformParticles;
+        U32 mID;
+
 protected:
         void removePart(const S32 part_num);
 
@@ -112,11 +119,9 @@ protected:
         LLVector3 mMinObjPos;
         LLVector3 mMaxObjPos;
 
-        LLPointer<LLVOPartGroup> mVOPartGroupp;
         LLViewerRegion *mRegionp;
 };
 
-
 class LLViewerPartSim
 {
 public:
@@ -132,7 +137,7 @@ public:
         void cleanupRegion(LLViewerRegion *regionp);
 
         BOOL shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping)
-        void addPart(LLViewerPart &part);
+        void addPart(LLViewerPart* part);
         void cleanMutedParticles(const LLUUID& task_id);
 
         friend class LLViewerPartGroup;
@@ -144,15 +149,18 @@ public:
         static void incPartCount(const S32 count)                       { sParticleCount += count; }
         static void decPartCount(const S32 count)                       { sParticleCount -= count; }
         
+        U32 mID;
+
 protected:
-        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent);
-        LLViewerPartGroup *put(LLViewerPart &part);
+        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size);
+        LLViewerPartGroup *put(LLViewerPart* part);
 
 protected:
-        LLDynamicArray<LLViewerPartGroup *> mViewerPartGroups;
-        LLDynamicArrayPtr<LLPointer<LLViewerPartSource> > mViewerPartSources;
+        typedef std::vector<LLViewerPartGroup *> group_list_t;
+        typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t;
+        group_list_t mViewerPartGroups;
+        source_list_t mViewerPartSources;
         LLFrameTimer mSimulationTimer;
-
         static S32 sMaxParticleCount;
         static S32 sParticleCount;
 };