diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-24 15:17:12 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-24 15:17:12 -0700 |
| commit | 72b17dea7e7eb13c387455a1567d4b746b9a7f1a (patch) | |
| tree | 5061f89e34785a1450359546b91d774cca787b7a | |
| parent | 7200b1500247ebdfbf69bb125c80b9528050698c (diff) | |
PATH-542: Ensuring that the rotation is properly updated after the ObjectUpdate message from the server.
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index a821a7e482..37b23b571c 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2056,12 +2056,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, } } - if (new_rot != mLastRot + if (new_rot != getRotation() || new_angv != old_angv) { - if (new_rot != mLastRot) + if (new_rot != getRotation()) { - mLastRot = new_rot; setRotation(new_rot); } diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 60665b4880..4a33c3a674 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -723,7 +723,6 @@ protected: F32 mTimeDilation; // Time dilation sent with the object. F32 mRotTime; // Amount (in seconds) that object has rotated according to angular velocity (llSetTargetOmega) - LLQuaternion mLastRot; // last rotation received from the simulator LLVOJointInfo* mJointInfo; U8 mState; // legacy |