diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index bbbf071570b4aeb9c184bb7844c1bcfe130738a2..6c4e70add081985dbc8b299b321d684ad46473ad 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2075,7 +2075,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)