Second Life viewer sources 1.23.0-RC

1 files changed, 6 insertions, 5 deletions

diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 16b282b..47e4a22 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -531,10 +532,10 @@ F32 LLDrawable::updateXform(BOOL undamped)
 
         if ((mCurrentScale != target_scale) ||
                 (!isRoot() && 
-                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || 
+                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED || 
                  !mVObjp->getAngularVelocity().isExactlyZero() ||
                  target_pos != mXform.getPosition() ||
-                 target_rot != mXform.getRotation()))
+                 target_rot != mXform.getRotation())))
         { //child prim moving or scale change requires immediate rebuild
                 gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
         }
@@ -1232,7 +1233,8 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
         LLVector3 center = (mExtents[0] + mExtents[1]) * 0.5f;
         LLVector3 size = (mExtents[1]-mExtents[0]) * 0.5f;
 
-        if (LLPipeline::sImpostorRender ||
+        if ((LLPipeline::sShadowRender && camera_in.AABBInFrustum(center, size)) ||
+                LLPipeline::sImpostorRender ||
                 (camera_in.AABBInFrustumNoFarClip(center, size) && 
                 AABBSphereIntersect(mExtents[0], mExtents[1], camera_in.getOrigin(), camera_in.mFrustumCornerDist)))
         {
@@ -1289,7 +1291,6 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
                         LLDrawable* drawable = child->mDrawable;                                        
                         if (!drawable)
                         {
-                                llwarns << "Corrupt drawable found while updating spatial bridge distance." << llendl;
                                 continue;
                         }