diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
commit | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (patch) | |
tree | a8525988388de004be72251c0d7783a61d314888 /indra/llcharacter/lljoint.h | |
parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
parent | b40fad02de170b5da179cacc22f32f5f25ffd7cb (diff) |
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
Diffstat (limited to 'indra/llcharacter/lljoint.h')
-rw-r--r-- | indra/llcharacter/lljoint.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index dc3c58cf64..2b1e2005c6 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -105,10 +105,15 @@ public: public: LLJoint(); + LLJoint(S32 joint_num); + // *TODO: Only used for LLVOAvatarSelf::mScreenp. *DOES NOT INITIALIZE mResetAfterRestoreOldXform* LLJoint( const std::string &name, LLJoint *parent=NULL ); - virtual ~LLJoint(); +private: + void init(); + +public: // set name and parent void setup( const std::string &name, LLJoint *parent=NULL ); @@ -178,7 +183,6 @@ public: virtual BOOL isAnimatable() const { return TRUE; } S32 getJointNum() const { return mJointNum; } - void setJointNum(S32 joint_num) { mJointNum = joint_num; } void restoreOldXform( void ); void restoreToDefaultXform( void ); |