From 7ecfa28c431a3599a99e92775d963241e1b943c0 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Wed, 16 Jan 2013 15:21:11 -0800 Subject: MAINT-2247 Child object does not update rotation while selected. --- indra/newview/lldrawable.cpp | 2 ++ 1 file changed, 2 insertions(+) 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; -- cgit v1.2.3 From 23336feed2b68f3b11266eaae545ce78875bb2ee Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Jan 2013 12:51:16 -0500 Subject: tag merge of DRTVWR-286 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e5cb4405e0..0053ac25d5 100644 --- a/.hgtags +++ b/.hgtags @@ -405,3 +405,4 @@ c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280 5df4802bec93c8d0a509946d826bb4c50c5442ec DRTVWR-281 7c1c33ba4cfd2d15ca51cc1ac440eca551331a4a DRTVWR-283 6b9c7dbebef793230d64e1b452577c8b142d4143 3.4.5-beta2 +ccf991e02dc2f63fb646324230d54832683f4a9b DRTVWR-286 -- cgit v1.2.3