diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/llprimitive | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llprimitive.h | 6 | ||||
| -rw-r--r-- | indra/llprimitive/lltreeparams.h | 2 |
2 files changed, 4 insertions, 4 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(); diff --git a/indra/llprimitive/lltreeparams.h b/indra/llprimitive/lltreeparams.h index fa55f584e3..957a42f3d3 100644 --- a/indra/llprimitive/lltreeparams.h +++ b/indra/llprimitive/lltreeparams.h @@ -12,7 +12,7 @@ /* for information about formulas associated with each type * check the Weber + Penn paper */ -typedef enum EShapeRatio { SR_CONICAL, SR_SPHERICAL, SR_HEMISPHERICAL, +enum EShapeRatio { SR_CONICAL, SR_SPHERICAL, SR_HEMISPHERICAL, SR_CYLINDRICAL, SR_TAPERED_CYLINDRICAL, SR_FLAME, SR_INVERSE_CONICAL, SR_TEND_FLAME, SR_ENVELOPE}; |