summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-08 07:27:59 -0700
committerOz Linden <oz@lindenlab.com>2012-08-08 07:27:59 -0700
commit337976096530729a7d671df68907cd59a7986972 (patch)
tree27d554390e09de3c1994a9d4bd56f189565f84b9 /indra/newview/llviewerobject.h
parent261c10adf3fafc9211e46fdefe41cfdece459d0f (diff)
parent36e36b94972b2f8787c5ce409048743373e44db4 (diff)
merge changes for DRTVWR-189
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r--indra/newview/llviewerobject.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 6addb383d4..e60c8a8d52 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -721,6 +721,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
U8 mState; // legacy
LLViewerObjectMedia* mMedia; // NULL if no media associated