diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:38 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:38 +0100 |
| commit | 9226d42d12b9edb792d65b28254c633d0dc64edc (patch) | |
| tree | 04d77d203a370b0215333465d3c184795c239c91 /indra/newview/llviewerobject.h | |
| parent | 006e15495515e6e4c233412a4deed0f34e7b0f12 (diff) | |
Backed out changeset 78dddb3a1dd3
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 49709d643a..be83fb7ef8 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -459,8 +459,6 @@ 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); @@ -476,7 +474,6 @@ public: void updateFlags(); BOOL setFlags(U32 flag, BOOL state); - void setPhysicsRep(U8 rep); virtual void dump() const; static U32 getNumZombieObjects() { return sNumZombieObjects; } @@ -556,9 +553,6 @@ public: // Grabbed from UPDATE_FLAGS U32 mFlags; - // Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties - U8 mPhysicsRep; - // Pipeline classes LLPointer<LLDrawable> mDrawable; |