diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-13 16:30:08 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-13 16:30:08 +0100 |
| commit | abec5d6c9b72f1d22c97593d682106e58e241aa6 (patch) | |
| tree | 5a26680da2f4305f35a953af7c69bbed571bbcc5 /indra/newview/llvoavatar.cpp | |
| parent | f7134144a6ed8f5710d02a84ad3ad5dc29cb0bd5 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
merge, mac build fix
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index b8646d42e7..f6ba01e5e8 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6284,18 +6284,11 @@ void LLVOAvatar::removeAttachmentOverridesForObject(const LLUUID& mesh_id) { mActiveOverrideMeshes.erase(mesh_id); - //Subsequent joints are relative to pelvis - avatar_joint_list_t::iterator iter = mSkeleton.begin(); - avatar_joint_list_t::iterator end = mSkeleton.end(); - LLJoint* pJointPelvis = getJoint("mPelvis"); - const std::string av_string = avString(); - for (S32 joint_num = 0; joint_num < LL_CHARACTER_MAX_ANIMATED_JOINTS; joint_num++) { LLJoint *pJoint = getJoint(joint_num); - //Reset joints except for pelvis if ( pJoint ) { bool dummy; // unused |