diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
| commit | eb6c8c937e214f58cc4da48bd4db455315de4c20 (patch) | |
| tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/llviewerobject.h | |
| parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge branch 'master' 6.4.10 into DRTVWR-510
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) |