diff options
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; |