diff options
| author | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
| commit | 354930014bc90a9c92b33300e5ecaf7fa861fe7b (patch) | |
| tree | b8ba1be3ae740aaa0db8ca7d639c78ce35c5918d /indra/newview/llviewerobject.h | |
| parent | 6be1f88a5ef99e1e40bb5701a250ba0728f56005 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge with tip of Release
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 03c5403a1e..12a9b47307 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -832,6 +832,7 @@ protected: BOOL mOnActiveList; BOOL mOnMap; // On the map. BOOL mStatic; // Object doesn't move. + S32 mSeatCount; S32 mNumFaces; F32 mRotTime; // Amount (in seconds) that object has rotated according to angular velocity (llSetTargetOmega) |