diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:30 +0100 |
| commit | cae68b48ec47265c8fd095fbbbb870233cccd52f (patch) | |
| tree | 20b24067bef52b664c9c1f9abddbce9db23594aa /indra/newview/llviewerobject.h | |
| parent | 43b0a2bde4beecb08585ef1fb9003720cf5cdc7b (diff) | |
| parent | 4391b48ed8aba2c004958c3b0630d58b81a0720f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index de7bfc0e07..49709d643a 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -459,7 +459,7 @@ 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; } + inline U8 getPhysicsRep() const { return mPhysicsRep; } bool getIncludeInSearch() const; void setIncludeInSearch(bool include_in_search); @@ -476,7 +476,7 @@ public: void updateFlags(); BOOL setFlags(U32 flag, BOOL state); - void setPhysicsShapeType(U8 type); + void setPhysicsRep(U8 rep); virtual void dump() const; static U32 getNumZombieObjects() { return sNumZombieObjects; } @@ -557,7 +557,7 @@ public: U32 mFlags; // Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties - U8 mPhysicsShapeType; + U8 mPhysicsRep; // Pipeline classes LLPointer<LLDrawable> mDrawable; |