1 files changed, 21 insertions, 10 deletions

diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 2658e67..8c06381 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -249,13 +250,13 @@ void LLViewerPartGroup::removePart(const S32 part_num)
 void LLViewerPartGroup::updateParticles(const F32 dt)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
-        S32 i, count;
+        S32 i;
         
         LLVector3 gravity(0.f, 0.f, -9.8f);
 
         LLViewerRegion *regionp = getRegion();
-        count = (S32) mParticles.size();
-        for (i = 0; i < count; i++)
+        S32 end = (S32) mParticles.size();
+        for (i = 0; i < end; i++)
         {
                 LLVector3 a(0.f, 0.f, 0.f);
                 LLViewerPart& part = *((LLViewerPart*) mParticles[i]);
@@ -364,9 +365,8 @@ void LLViewerPartGroup::updateParticles(const F32 dt)
                 // Kill dead particles (either flagged dead, or too old)
                 if ((part.mLastUpdateTime > part.mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part.mFlags))
                 {
-                        removePart(i);
-                        i--;
-                        count--;
+                        end--;
+                        LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
                 }
                 else 
                 {
@@ -375,13 +375,24 @@ void LLViewerPartGroup::updateParticles(const F32 dt)
                         {
                                 // Transfer particles between groups
                                 gWorldPointer->mPartSim.put(&part);
-                                removePart(i);
-                                i--;
-                                count--;
+                                end--;
+                                LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
                         }
                 }
         }
 
+        S32 removed = (S32)mParticles.size() - end;
+        if (removed > 0)
+        {
+                // we removed one or more particles, so flag this group for update
+                mParticles.erase(mParticles.begin() + end, mParticles.end());
+                if (mVOPartGroupp.notNull())
+                {
+                        gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                }
+                LLViewerPartSim::decPartCount(removed);
+        }
+        
         // Kill the viewer object if this particle group is empty
         if (mParticles.empty())
         {
@@ -480,7 +491,7 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
         const F32 MAX_MAG = 1000000.f*1000000.f; // 1 million
         if (part->mPosAgent.magVecSquared() > MAX_MAG || !part->mPosAgent.isFinite())
         {
-#if !LL_RELEASE_FOR_DOWNLOAD
+#if 0 && !LL_RELEASE_FOR_DOWNLOAD
                 llwarns << "LLViewerPartSim::put Part out of range!" << llendl;
                 llwarns << part->mPosAgent << llendl;
 #endif