Backported fix for VWR-3871 (prim position appears to be off) from 1.22

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5fdd770..1f33ca1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -24,6 +24,9 @@
         * linden/indra/llui/llfloater.cpp:
         Backported possible crash fix in llfloater.cpp from 1.22.
 
+        * linden/indra/newview/lldrawable.cpp:
+        Backported fix for VWR-3871 (prim position appears to be off) from 1.22.
+
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.1.0 RC2                        -=
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5e4aafc..e058681 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -497,7 +497,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
         F32 dist_squared = 0.f;
         F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-        if (damped && mDistanceWRTCamera > 0.0f)
+        if (damped && isVisible())
         {
                 F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
                 LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
@@ -521,11 +521,19 @@ F32 LLDrawable::updateXform(BOOL undamped)
                 {
                         // snap to final position
                         dist_squared = 0.0f;
+                        if (!isRoot())
+                        { //child prim snapping to some position, needs a rebuild
+                                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+                        }
                 }
         }
 
         if ((mCurrentScale != target_scale) ||
-                (!isRoot() && (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || !mVObjp->getAngularVelocity().isExactlyZero()))
+                (!isRoot() && 
+                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || 
+                 !mVObjp->getAngularVelocity().isExactlyZero() ||
+                 target_pos != mXform.getPosition() ||
+                 target_rot != mXform.getRotation()))
         { //child prim moving or scale change requires immediate rebuild
                 gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
         }