aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llprimitive/llprimitive.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llprimitive/llprimitive.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llprimitive/llprimitive.h')
-rw-r--r--linden/indra/llprimitive/llprimitive.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index e698a31..82df35c 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -378,7 +378,7 @@ public:
378#endif 378#endif
379 379
380 LLPCode getPCode() const { return mPrimitiveCode; } 380 LLPCode getPCode() const { return mPrimitiveCode; }
381 const char * getPCodeString() const { return pCodeToString(mPrimitiveCode); } 381 std::string getPCodeString() const { return pCodeToString(mPrimitiveCode); }
382 const LLVector3& getAngularVelocity() const { return mAngularVelocity; } 382 const LLVector3& getAngularVelocity() const { return mAngularVelocity; }
383 const LLVector3& getVelocity() const { return mVelocity; } 383 const LLVector3& getVelocity() const { return mVelocity; }
384 const LLVector3& getAcceleration() const { return mAcceleration; } 384 const LLVector3& getAcceleration() const { return mAcceleration; }
@@ -400,7 +400,7 @@ public:
400 void removeFlags(U32 flags) { mMiscFlags &= ~flags; } 400 void removeFlags(U32 flags) { mMiscFlags &= ~flags; }
401 U32 getFlags() const { return mMiscFlags; } 401 U32 getFlags() const { return mMiscFlags; }
402 402
403 static const char *pCodeToString(const LLPCode pcode); 403 static std::string pCodeToString(const LLPCode pcode);
404 static LLPCode legacyToPCode(const U8 legacy); 404 static LLPCode legacyToPCode(const U8 legacy);
405 static U8 pCodeToLegacy(const LLPCode pcode); 405 static U8 pCodeToLegacy(const LLPCode pcode);
406 static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis); 406 static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis);