diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2013-01-24 15:32:36 -0800 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2013-01-24 15:32:36 -0800 |
| commit | 4d589df2fd9a19cef248987e9f1f71b9be1f9aaa (patch) | |
| tree | 7a1bbea0d20d1c672b44373d1d8e220c49c5d7f8 /indra/newview | |
| parent | aee0766f35d724bfddc4be6b6f0b100467f3b1f4 (diff) | |
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
* A fix that doesn't break tanks. Reverts MAINT-1742
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index b15ffec9e3..d041baea90 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -550,9 +550,10 @@ F32 LLDrawable::updateXform(BOOL undamped) } else { - dist_squared = dist_vec_squared(old_pos, target_pos); + // The following fixes MAINT-1742 but breaks vehicles similar to MAINT-2275 + // dist_squared = dist_vec_squared(old_pos, target_pos); - // The following "makes sense" and fixes MAINT-2247 but causes MAINT-2275 + // The following fixes MAINT-2247 but causes MAINT-2275 //dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f; //dist_squared += dist_vec_squared(old_scale, target_scale); } |