diff --git a/.hgtags b/.hgtags
index 90519774646dbf394368ffba913ca85ccc5fa390..437d1285c1a938e83112471ad156a8eeb6c40c50 100755
--- a/.hgtags
+++ b/.hgtags
@@ -363,3 +363,5 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193
 4b2c52aecb7a75de31dbb12d9f5b9a251d8707be DRTVWR-191
 7602f61c804a512764e349c034c02ddabeefebc4 DRTVWR-196
 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2
+37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200
+182a9bf30e81070361bb020a78003b1cf398e79c 3.4.0-beta3
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 8bc6a937d8c0f2233592b2358ecb566154053aac..b2e6dc4571ff59bb975d13b155f524b051d0eca0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2043,7 +2043,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 	{
 		if (new_angv != old_angv)
 		{
-			resetRotTime();
+			if (flagUsePhysics())
+			{
+				resetRot();
+			}
+			else
+			{
+				resetRotTime();
+			}
 		}
 
 		// Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)