diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-17 14:54:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-17 14:54:35 -0400 |
| commit | f44bde8a8f0f11577543a4b1122d63854adcb3f4 (patch) | |
| tree | 2514197051218095758a815e614a807acc8e035e | |
| parent | 5374732db2c8e4a95e2ecbb155c8919cd32bc342 (diff) | |
| parent | 29aace5692da95c3937368b8f33b9c88112acbed (diff) | |
pull back fixes from 3.4.0-beta7
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 1 |
3 files changed, 14 insertions, 3 deletions
@@ -306,3 +306,5 @@ af7b28e75bd5a629cd9e0dc46fb3f1757626f493 DRTVWR-212 62b07aa81b1957897c3846292bb9412977b0af6c 3.3.4-beta6 d02759655d6b36d60f4a927e4bfce82844a82ef5 3.4.0-release baa627938dbb7956f45e1eebef11ffe9e7f2e5bc 3.4.1-beta1 +ceed0b65a69f1eac20d523e0203320a32f9a3f3c DRTVWR-215 +733ceac77583874f3626ef7a15c105b83ef0f5bb 3.4.0-beta7 diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 0a6c51b378..97783d843e 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -236,6 +236,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe mTimeDilation(1.f), mRotTime(0.f), mAngularVelocityRot(), + mPreviousRotation(), mJointInfo(NULL), mState(0), mMedia(NULL), @@ -2072,10 +2073,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, } } - if (new_rot != getRotation() - || new_angv != old_angv) + if ((new_rot != getRotation()) + || (new_angv != old_angv)) { - if (new_angv != old_angv) + if (new_rot != mPreviousRotation) + { + resetRot(); + } + else if (new_angv != old_angv) { if (flagUsePhysics() || new_angv.isExactlyZero()) { @@ -2087,6 +2092,9 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, } } + // Remember the last rotation value + mPreviousRotation = new_rot; + // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega) setRotation(new_rot * mAngularVelocityRot); setChanged(ROTATED | SILHOUETTE); diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 83e34dc6ca..fbf6361ffb 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -734,6 +734,7 @@ protected: F32 mTimeDilation; // Time dilation sent with the object. F32 mRotTime; // Amount (in seconds) that object has rotated according to angular velocity (llSetTargetOmega) LLQuaternion mAngularVelocityRot; // accumulated rotation from the angular velocity computations + LLQuaternion mPreviousRotation; LLVOJointInfo* mJointInfo; U8 mState; // legacy |