summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/lljoint.cpp2
-rw-r--r--indra/llcharacter/lljoint.h7
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