diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
| commit | e2b51b8884d1003a3312276611b8a8c34123bc36 (patch) | |
| tree | 2a62d60e216e172685670230e544103444e28c4c /indra/newview/llviewerobject.h | |
| parent | e2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff) | |
| parent | 7bb6532e93b7536a9a11cf19db10ba0cda1d99c3 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index be83fb7ef8..0fd0cbfa60 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -181,6 +181,7 @@ public: void setOnActiveList(BOOL on_active) { mOnActiveList = on_active; } virtual BOOL isAttachment() const { return FALSE; } + virtual LLVOAvatar* getAvatar() const; //get the avatar this object is attached to, or NULL if object is not an attachment virtual BOOL isHUDAttachment() const { return FALSE; } virtual void updateRadius() {}; virtual F32 getVObjRadius() const; // default implemenation is mDrawable->getRadius() @@ -229,6 +230,7 @@ public: virtual BOOL isFlexible() const { return FALSE; } virtual BOOL isSculpted() const { return FALSE; } + virtual BOOL isMesh() const { return FALSE; } virtual BOOL hasLightTexture() const { return FALSE; } // This method returns true if the object is over land owned by @@ -459,6 +461,8 @@ public: inline BOOL flagCameraDecoupled() const { return ((mFlags & FLAGS_CAMERA_DECOUPLED) != 0); } inline BOOL flagObjectMove() const { return ((mFlags & FLAGS_OBJECT_MOVE) != 0); } + inline U8 getPhysicsShapeType() const { return mPhysicsShapeType; } + bool getIncludeInSearch() const; void setIncludeInSearch(bool include_in_search); @@ -474,6 +478,7 @@ public: void updateFlags(); BOOL setFlags(U32 flag, BOOL state); + void setPhysicsShapeType(U8 type); virtual void dump() const; static U32 getNumZombieObjects() { return sNumZombieObjects; } @@ -553,6 +558,9 @@ public: // Grabbed from UPDATE_FLAGS U32 mFlags; + // Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties + U8 mPhysicsShapeType; + // Pipeline classes LLPointer<LLDrawable> mDrawable; |