diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-18 14:43:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-18 14:43:12 -0500 |
| commit | 4a9c53e9fd2031c1250454476ee8c4051198dba8 (patch) | |
| tree | 93d9fe99ed947f89fb5cc421e2100769971d68dc /indra | |
| parent | 493e3a24077466b75cf0258fdcacab272d885bcf (diff) | |
| parent | 23336feed2b68f3b11266eaae545ce78875bb2ee (diff) | |
merge changes for MAINT-2247
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index b7270e696e..647c3355ca 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -550,6 +550,8 @@ F32 LLDrawable::updateXform(BOOL undamped) else { dist_squared = dist_vec_squared(old_pos, target_pos); + dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f; + dist_squared += dist_vec_squared(old_scale, target_scale); } LLVector3 vec = mCurrentScale-target_scale; |