diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
| commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
| tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/lldrawable.cpp | |
| parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
| parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) | |
merge changes for DRTVWR-276
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 7cfb58e544..b7270e696e 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -547,6 +547,10 @@ F32 LLDrawable::updateXform(BOOL undamped) } } } + else + { + dist_squared = dist_vec_squared(old_pos, target_pos); + } LLVector3 vec = mCurrentScale-target_scale; |