diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-11-04 14:24:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-11-04 14:24:03 -0400 |
| commit | 204e474225c652fcd00ffc3de56171594d768afb (patch) | |
| tree | a19fd81a8bb719657e3b8a71c05902348572016f /indra/llcharacter | |
| parent | 5dcd81c15507ad8f487e5727bc7a94de82f6fb45 (diff) | |
SL-524 - resetSkeleton() now includes collision volume joint positions. Also removed no-longer-needed LLJoint::mId field
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 2 | ||||
| -rw-r--r-- | indra/llcharacter/lljoint.h | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 6ea2953e89..a3d5679f65 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -510,7 +510,6 @@ void LLJoint::clearAttachmentPosOverrides() { m_attachmentPosOverrides.clear(); setPosition(m_posBeforeOverrides); - setId( LLUUID::null ); } } @@ -700,7 +699,6 @@ void LLJoint::clearAttachmentScaleOverrides() { m_attachmentScaleOverrides.clear(); setScale(m_scaleBeforeOverrides); - setId( LLUUID::null ); } } diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index b2df90dc92..0c8fbfebb0 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -112,8 +112,6 @@ protected: // explicit transformation members LLXformMatrix mXform; - LLUUID mId; - LLVector3 mDefaultPosition; LLVector3 mDefaultScale; @@ -286,11 +284,6 @@ public: // These are used in checks of whether a pos/scale override is considered significant. bool aboveJointPosThreshold(const LLVector3& pos) const; bool aboveJointScaleThreshold(const LLVector3& scale) const; - - //Accessor for the joint id - LLUUID getId( void ) { return mId; } - //Setter for the joints id - void setId( const LLUUID& id ) { mId = id;} }; #endif // LL_LLJOINT_H |