summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2007-07-02 17:10:30 +0000
committerDon Kjer <don@lindenlab.com>2007-07-02 17:10:30 +0000
commite5124431b54d4342d4677371fccca5bc7250c079 (patch)
tree8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/llprimitive/llprimitive.h
parentce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff)
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rw-r--r--indra/llprimitive/llprimitive.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index ab1fc4f719..b5a46a41e6 100644
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -320,14 +320,14 @@ public:
void setAcceleration(const F32 x, const F32 y, const F32 z) { mAcceleration.setVec(x,y,z); }
#endif
- const LLPCode getPCode() const { return mPrimitiveCode; }
+ LLPCode getPCode() const { return mPrimitiveCode; }
const char * getPCodeString() const { return pCodeToString(mPrimitiveCode); }
const LLVector3& getAngularVelocity() const { return mAngularVelocity; }
const LLVector3& getVelocity() const { return mVelocity; }
const LLVector3& getAcceleration() const { return mAcceleration; }
- const U8 getNumTEs() const { return mNumTEs; }
+ U8 getNumTEs() const { return mNumTEs; }
- const U8 getMaterial() const { return mMaterial; }
+ U8 getMaterial() const { return mMaterial; }
void setVolumeType(const U8 code);
U8 getVolumeType();