merge changes for MAINT-2247

.hgtags

@@ -407,3 +407,4 @@ c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280
 6b9c7dbebef793230d64e1b452577c8b142d4143 3.4.5-beta2
 37947e4f771f001b551581bf7cd0051c3153beed DRTVWR-282
 6482cceb91cda68b799f3e6cdc66d33bf123547a DRTVWR-284
+ccf991e02dc2f63fb646324230d54832683f4a9b DRTVWR-286

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;