summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-11-03 05:46:31 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-11-03 05:46:31 -0500
commit7fec81b102e92e1a4e5a36fde077ef9b82cc7123 (patch)
treed4cda26dd26ac29b771aa235bc660c02774de8ef /indra/llcharacter
parent90aca8f95af4c73e592d9657d0eba4d9a709244c (diff)
SL-93 WIP - pelvis fixup offsets
Diffstat (limited to 'indra/llcharacter')
-rwxr-xr-xindra/llcharacter/lljoint.cpp8
-rwxr-xr-xindra/llcharacter/lljoint.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 5e54215739..af5393ef03 100755
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -340,6 +340,14 @@ void LLJoint::removeAttachmentPosOverride( const LLUUID& mesh_id, const std::str
}
//--------------------------------------------------------------------
+ // hasAttachmentPosOverride()
+ //--------------------------------------------------------------------
+bool LLJoint::hasAttachmentPosOverride( LLVector3& pos, LLUUID& mesh_id ) const
+{
+ return m_attachmentOverrides.findActiveOverride(mesh_id,pos);
+}
+
+//--------------------------------------------------------------------
// updatePos()
//--------------------------------------------------------------------
void LLJoint::updatePos(const std::string& av_info)
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index f8639af3de..56da8e83b2 100755
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -201,6 +201,7 @@ public:
void addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh_id, const std::string& av_info );
void removeAttachmentPosOverride( const LLUUID& mesh_id, const std::string& av_info );
+ bool hasAttachmentPosOverride( LLVector3& pos, LLUUID& mesh_id ) const;
//Accessor for the joint id
LLUUID getId( void ) { return mId; }