summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-17 16:44:37 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-17 16:44:37 -0700
commit19f25eea3d5dab061441491b41fa8cc416a273b5 (patch)
tree4bf5eff86a418d26f83eebdb52236f3040903813 /indra/newview/lldrawable.cpp
parentab38c854c34ada4fc166487b980fa2137badfdb9 (diff)
parent9d701e563b90a70794fccc28bdfb8edb5b0abfeb (diff)
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index cdf6460408..05ae336bc5 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -547,6 +547,10 @@ F32 LLDrawable::updateXform(BOOL undamped)
}
}
}
+ else if (!damped && isVisible())
+ {
+ dist_squared = dist_vec_squared(old_pos, target_pos);
+ }
LLVector3 vec = mCurrentScale-target_scale;