diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
| commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
| tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/newview/llviewerobject.h | |
| parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
| parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) | |
Merge
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 |