Second Life viewer sources 1.23.3-RC

1 files changed, 6 insertions, 10 deletions

diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 47e4a22..44a5de9 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -673,7 +673,7 @@ BOOL LLDrawable::updateMoveDamped()
         return done_moving;
 }
 
-void LLDrawable::updateDistance(LLCamera& camera)
+void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 {
         //switch LOD with the spatial group to avoid artifacts
         //LLSpatialGroup* sg = getSpatialGroup();
@@ -695,7 +695,7 @@ void LLDrawable::updateDistance(LLCamera& camera)
                         for (S32 i = 0; i < getNumFaces(); i++)
                         {
                                 LLFace* facep = getFace(i);
-                                if (facep->getPoolType() == LLDrawPool::POOL_ALPHA)
+                                if (force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA)
                                 {
                                         LLVector3 box = (facep->mExtents[1] - facep->mExtents[0]) * 0.25f;
                                         LLVector3 v = (facep->mCenterLocal-camera.getOrigin());
@@ -736,11 +736,7 @@ void LLDrawable::updateTexture()
 
         if (getVOVolume())
         {
-                if (!isActive())
-                {
-                        //gPipeline.markMoved(this);
-                }
-                else
+                if (isActive())
                 {
                         if (isRoot())
                         {
@@ -1269,7 +1265,7 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
         }
 }
 
-void LLSpatialBridge::updateDistance(LLCamera& camera_in)
+void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 {
         if (mDrawable == NULL)
         {
@@ -1279,7 +1275,7 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 
         LLCamera camera = transformCamera(camera_in);
         
-        mDrawable->updateDistance(camera);
+        mDrawable->updateDistance(camera, force_update);
         
         if (mDrawable->getVObj())
         {
@@ -1296,7 +1292,7 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 
                         if (!drawable->isAvatar())
                         {
-                                drawable->updateDistance(camera);
+                                drawable->updateDistance(camera, force_update);
                         }
                 }
         }