diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2013-01-16 15:21:11 -0800 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2013-01-16 15:21:11 -0800 |
| commit | 7ecfa28c431a3599a99e92775d963241e1b943c0 (patch) | |
| tree | 27487e93e76aa6820dd02d25ac2cffb17612ebe4 /indra/newview | |
| parent | c842494b774eedc6066f317853a82586ab85524e (diff) | |
MAINT-2247 Child object does not update rotation while selected.
Diffstat (limited to 'indra/newview')
| -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; |