aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llprimitive
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llprimitive')
-rw-r--r--linden/indra/llprimitive/llprimitive.h6
-rw-r--r--linden/indra/llprimitive/lltreeparams.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index 29cd09f..1a568d1 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -340,14 +340,14 @@ public:
340 void setAcceleration(const F32 x, const F32 y, const F32 z) { mAcceleration.setVec(x,y,z); } 340 void setAcceleration(const F32 x, const F32 y, const F32 z) { mAcceleration.setVec(x,y,z); }
341#endif 341#endif
342 342
343 const LLPCode getPCode() const { return mPrimitiveCode; } 343 LLPCode getPCode() const { return mPrimitiveCode; }
344 const char * getPCodeString() const { return pCodeToString(mPrimitiveCode); } 344 const char * getPCodeString() const { return pCodeToString(mPrimitiveCode); }
345 const LLVector3& getAngularVelocity() const { return mAngularVelocity; } 345 const LLVector3& getAngularVelocity() const { return mAngularVelocity; }
346 const LLVector3& getVelocity() const { return mVelocity; } 346 const LLVector3& getVelocity() const { return mVelocity; }
347 const LLVector3& getAcceleration() const { return mAcceleration; } 347 const LLVector3& getAcceleration() const { return mAcceleration; }
348 const U8 getNumTEs() const { return mNumTEs; } 348 U8 getNumTEs() const { return mNumTEs; }
349 349
350 const U8 getMaterial() const { return mMaterial; } 350 U8 getMaterial() const { return mMaterial; }
351 351
352 void setVolumeType(const U8 code); 352 void setVolumeType(const U8 code);
353 U8 getVolumeType(); 353 U8 getVolumeType();
diff --git a/linden/indra/llprimitive/lltreeparams.h b/linden/indra/llprimitive/lltreeparams.h
index 29bbc9a..2754eb4 100644
--- a/linden/indra/llprimitive/lltreeparams.h
+++ b/linden/indra/llprimitive/lltreeparams.h
@@ -32,7 +32,7 @@
32/* for information about formulas associated with each type 32/* for information about formulas associated with each type
33 * check the Weber + Penn paper 33 * check the Weber + Penn paper
34 */ 34 */
35typedef enum EShapeRatio { SR_CONICAL, SR_SPHERICAL, SR_HEMISPHERICAL, 35enum EShapeRatio { SR_CONICAL, SR_SPHERICAL, SR_HEMISPHERICAL,
36 SR_CYLINDRICAL, SR_TAPERED_CYLINDRICAL, SR_FLAME, 36 SR_CYLINDRICAL, SR_TAPERED_CYLINDRICAL, SR_FLAME,
37 SR_INVERSE_CONICAL, SR_TEND_FLAME, SR_ENVELOPE}; 37 SR_INVERSE_CONICAL, SR_TEND_FLAME, SR_ENVELOPE};
38 38