diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 15:19:31 -0700 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 15:19:31 -0700 |
commit | 8f9da8b37d1983a2c2c69efec0ec9c8db9230c1a (patch) | |
tree | f99f53363efaa8ebc6379aa7d6f0969760286d14 /indra/newview/llviewerobject.h | |
parent | 4ddd7968757393657055f61bb51bef7c6e721ebf (diff) | |
parent | e7a5dc7cda09e65f8592793990c494a978a21271 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 277bd1c430..1fb30db8f2 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -725,6 +725,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; U8 mState; // legacy LLViewerObjectMedia* mMedia; // NULL if no media associated |