diff -r fbbee98b7512 -r c1b719490b83 indra/newview/lldrawable.cpp
--- a/indra/newview/lldrawable.cpp	Tue Feb 12 07:06:24 2013 -0500
+++ b/indra/newview/lldrawable.cpp	Sun Feb 17 08:19:39 2013 +0100
@@ -577,6 +577,15 @@
 			mVObjp->dirtySpatialGroup();
 		}
 	}
+	else if (!isRoot() &&
+            (
+            dist_vec_squared(old_pos, target_pos) > 0.f
+            ||
+            (1.f - dot(old_rot, target_rot)) > 0.f
+            ))
+	{ //fix for BUG-840, MAINT-2275, MAINT-1742, MAINT-2247
+		gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+	}
 	else if (!getVOVolume() && !isAvatar())
 	{
 		movePartition();