diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-10-15 14:23:29 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-10-15 14:23:29 -0700 |
| commit | d6e3b0445a49d0fb10ca9e6cb668c65984ce1866 (patch) | |
| tree | e12511d8f64e0ec42c2d6abb4ed4efa5f7853a83 /indra/newview/llviewerobject.h | |
| parent | 9b7bfcf594a8388eae087886c53ead164251c62e (diff) | |
| parent | 1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (diff) | |
Merge in viewer-development code and fix build
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 02b4f84785..97cf0a4850 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -723,6 +723,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 |