diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/character/avatar_lad.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index a1af48952b..749fb65a01 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -490,7 +490,7 @@ group="8" pie_slice="7" name="Alt Left Ear" - joint="mFaceEarLeft" + joint="mFaceEar1Left" position="0.000 0.000 0.000" rotation="0 0 0" visible_in_first_person="true"/> @@ -500,7 +500,7 @@ group="8" pie_slice="8" name="Alt Right Ear" - joint="mFaceEarRight" + joint="mFaceEar1Right" position="0.000 0.000 0.000" rotation="0 0 0" visible_in_first_person="true"/> diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 204432dc16..4d6f0f78b2 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5521,17 +5521,14 @@ BOOL LLVOAvatar::loadSkeletonNode () LLJoint *parent_joint = getJoint(info->mJointName); if (!parent_joint) { - // If the intended location for attachment point is unavailable, stick it in a default location. - LL_INFOS() << "attachment pt " << info->mName << " using mPelvis as default parent" << LL_ENDL; - parent_joint = getJoint("mPelvis"); - } - if (!parent_joint) - { + // If the intended parent for attachment point is unavailable, avatar_lad.xml is corrupt. LL_WARNS() << "No parent joint by name " << info->mJointName << " found for attachment point " << info->mName << LL_ENDL; - delete attachment; - continue; - } - + LL_ERRS() << "Invalid avatar_lad.xml file" << LL_ENDL; + // If we wanted to continue from this case, we could do: + //delete attachment; + //continue; + // but there's no point. + } if (info->mHasPosition) { attachment->setOriginalPosition(info->mPosition); |