diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-20 19:43:54 -0700 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-20 19:43:54 -0700 |
commit | c6a2ac0489859111276421d620abd156339c607d (patch) | |
tree | 1bfbeb5d0ddcedd77854e5e5c8b6ad675ed6ef3c /indra/newview/llviewerobject.h | |
parent | ae127dc01ab10d407cf165ae2ad74060f65c1832 (diff) | |
parent | 29cdf94e95d0a4365bd18860c4759f9a6a13f45a (diff) |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
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 |