1 files changed, 13 insertions, 7 deletions

diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index a0f8068..b040366 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -108,7 +108,7 @@ void LLVOPartGroup::setPixelAreaAndAngle(LLAgent &agent)
         }
 }
 
-void LLVOPartGroup::updateTextures()
+void LLVOPartGroup::updateTextures(LLAgent &agent)
 {
         // Texture stats for particles need to be updated in a different way...
 }
@@ -154,6 +154,11 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 group = drawable->getSpatialGroup();
         }
 
+        if (group && group->isVisible())
+        {
+                dirtySpatialGroup(TRUE);
+        }
+
         if (!num_parts)
         {
                 if (group && drawable->getNumFaces())
@@ -186,13 +191,12 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
         S32 count=0;
         mDepth = 0.f;
         S32 i = 0 ;
-        LLVector3 camera_agent = getCameraPosition();
         for (i = 0 ; i < (S32)mViewerPartGroupp->mParticles.size(); i++)
         {
                 const LLViewerPart *part = mViewerPartGroupp->mParticles[i];
 
                 LLVector3 part_pos_agent(part->mPosAgent);
-                LLVector3 at(part_pos_agent - camera_agent);
+                LLVector3 at(part_pos_agent - LLViewerCamera::getInstance()->getOrigin());
 
                 F32 camera_dist_squared = at.lengthSquared();
                 F32 inv_camera_dist_squared;
@@ -315,7 +319,7 @@ void LLVOPartGroup::getGeometry(S32 idx,
         up *= 0.5f*part.mScale.mV[1];
 
 
-        LLVector3 normal = -LLViewerCamera::getInstance()->getXAxis();
+        const LLVector3& normal = -LLViewerCamera::getInstance()->getXAxis();
                 
         *verticesp++ = part_pos_agent + up - right;
         *verticesp++ = part_pos_agent - up - right;
@@ -352,12 +356,12 @@ U32 LLVOPartGroup::getPartitionType() const
 }
 
 LLParticlePartition::LLParticlePartition()
-: LLSpatialPartition(LLDrawPoolAlpha::VERTEX_DATA_MASK)
+: LLSpatialPartition(LLDrawPoolAlpha::VERTEX_DATA_MASK, TRUE, GL_DYNAMIC_DRAW_ARB)
 {
         mRenderPass = LLRenderPass::PASS_ALPHA;
         mDrawableType = LLPipeline::RENDER_TYPE_PARTICLES;
         mPartitionType = LLViewerRegion::PARTITION_PARTICLE;
-        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+        // mBufferUsage = GL_DYNAMIC_DRAW_ARB; // KL SD hybrid code
         mSlopRatio = 0.f;
         mLODPeriod = 1;
 }
@@ -481,7 +485,9 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
                         U32 end = start + facep->getGeomCount()-1;
                         U32 offset = facep->getIndicesStart();
                         U32 count = facep->getIndicesCount();
-                        LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), buffer, fullbright); 
+                        LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), 
+                                facep->getTexture(),
+                                buffer, fullbright); 
                         info->mExtents[0] = group->mObjectExtents[0];
                         info->mExtents[1] = group->mObjectExtents[1];
                         info->mVSize = vsize;