summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-02-07 18:43:31 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-02-07 21:17:34 +0200
commit67b908cd2020231f30386294e4d0c5f199a007a0 (patch)
treea8f8209b0eae50a3d8e125fb446a7741e402cf0e /indra/newview/llvoavatar.cpp
parentf249365f23e5ed3509a7f665ead53d4e781ff6d2 (diff)
SL-379 WIP Joint overrides tab
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp50
1 files changed, 0 insertions, 50 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index dac516d15c..3b51d07f96 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6376,56 +6376,6 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
}
//-----------------------------------------------------------------------------
-// getAttachmentOverrides
-//-----------------------------------------------------------------------------
-void LLVOAvatar::getAttachmentOverrides(joint_override_data_map_t &joint_overrides, attach_override_data_map_t &attach_overrides) const
-{
- LLVector3 pos, scale;
- LLUUID mesh_id;
- S32 count = 0;
-
- // Bones
- for (avatar_joint_list_t::const_iterator iter = mSkeleton.begin();
- iter != mSkeleton.end(); ++iter)
- {
- const LLJoint* pJoint = (*iter);
- LLJointOverrideData data;
- bool joint_override = false;
- if (pJoint && pJoint->hasAttachmentPosOverride(pos, mesh_id))
- {
- pJoint->getAllAttachmentPosOverrides(count, data.mPosOverrides);
- data.mActivePosOverride = pos;
- joint_override = true;
- }
- if (pJoint && pJoint->hasAttachmentScaleOverride(scale, mesh_id))
- {
- pJoint->getAllAttachmentScaleOverrides(count, data.mPosOverrides);
- data.mActiveScaleOverride = scale;
- joint_override = true;
- }
- if (joint_override)
- {
- joint_overrides[pJoint->getName()] = data;
- }
- }
-
- // Attachment points
- for (attachment_map_t::const_iterator iter = mAttachmentPoints.begin();
- iter != mAttachmentPoints.end();
- ++iter)
- {
- const LLViewerJointAttachment *attachment_pt = (*iter).second;
- if (attachment_pt && attachment_pt->hasAttachmentPosOverride(pos, mesh_id))
- {
- LLAttachmentOverrideData data;
- attachment_pt->getAllAttachmentPosOverrides(count, data.mPosOverrides);
- data.mActivePosOverride = pos;
- attach_overrides[attachment_pt->getName()] = data;
- }
- }
-}
-
-//-----------------------------------------------------------------------------
// removeAttachmentOverridesForObject
//-----------------------------------------------------------------------------
void LLVOAvatar::removeAttachmentOverridesForObject(LLViewerObject *vo)