diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:35:26 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:35:26 -0700 |
| commit | b2381a039de7e0edbd643d198b85ba8e00524b6b (patch) | |
| tree | 86eec746292bf159d1366e659eee49de94df9e68 /indra/newview/llviewerobject.h | |
| parent | 92257b55a405f3625cbbcf07357b3ca929a04882 (diff) | |
DEV-47845 Cleaned up names.
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 da7e4002f5..8b542af773 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -460,7 +460,7 @@ 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; } + inline U8 getPhysicsShapeType() const { return mPhysicsShapeType; } bool getIncludeInSearch() const; void setIncludeInSearch(bool include_in_search); @@ -477,7 +477,7 @@ public: void updateFlags(); BOOL setFlags(U32 flag, BOOL state); - void setPhysicsRep(U8 rep); + void setPhysicsShapeType(U8 type); virtual void dump() const; static U32 getNumZombieObjects() { return sNumZombieObjects; } @@ -558,7 +558,7 @@ public: U32 mFlags; // Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties - U8 mPhysicsRep; + U8 mPhysicsShapeType; // Pipeline classes LLPointer<LLDrawable> mDrawable; |