diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-26 18:23:05 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-26 18:23:05 -0700 |
| commit | 92257b55a405f3625cbbcf07357b3ca929a04882 (patch) | |
| tree | d8c2d3b5602d6d0cda87f72f0a13046a1a18ddde /indra/newview/llviewerobject.h | |
| parent | 0afe2491ab6a05bf62a2fce438dfdbbaf0b191df (diff) | |
DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset.
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index bf5e0b6656..da7e4002f5 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -460,6 +460,8 @@ public: inline BOOL flagCameraDecoupled() const { return ((mFlags & FLAGS_CAMERA_DECOUPLED) != 0); } inline BOOL flagObjectMove() const { return ((mFlags & FLAGS_OBJECT_MOVE) != 0); } + inline U8 getPhysicsRep() const { return mPhysicsRep; } + bool getIncludeInSearch() const; void setIncludeInSearch(bool include_in_search); @@ -475,6 +477,7 @@ public: void updateFlags(); BOOL setFlags(U32 flag, BOOL state); + void setPhysicsRep(U8 rep); virtual void dump() const; static U32 getNumZombieObjects() { return sNumZombieObjects; } @@ -554,6 +557,9 @@ public: // Grabbed from UPDATE_FLAGS U32 mFlags; + // Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties + U8 mPhysicsRep; + // Pipeline classes LLPointer<LLDrawable> mDrawable; |