livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1672: Neck and root attachment point viewing. From Kadah.

Tonya Souther 2011-10-29 07:25:28 -05:00
parent 1dacba4d55
commit fa04a08892
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/character/avatar_lad.xml
View File

@ -392,7 +392,27 @@
hud="true"
max_attachment_offset="2.0"
visible_in_first_person="true" />
<attachment_point
id="39"
group="9"
pie_slice="1"
name="Neck"
joint="mNeck"
position="0 0 0"
rotation="0 0 0"
visible_in_first_person="true" />
<attachment_point
id="40"
group="9"
pie_slice="2"
name="Avatar Center"
joint="mRoot"
position="0 0 0"
rotation="0 0 0"
visible_in_first_person="true" />
<attachment_point
id="127"
group="6"

4
indra/newview/llvoavatar.cpp
View File

@ -6180,14 +6180,14 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
if (!attachment)
{
if(attachmentID != 127 && !((attachmentID > 38) && (attachmentID <= 68)))
if(attachmentID != 127 && !((attachmentID > 40) && (attachmentID <= 68)))
{
llwarns << "Object attachment point invalid: " << attachmentID << llendl;
}
// attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)
// [SL:KB] - Patch: Appearance-LegacyMultiAttachment | Checked: 2010-08-28 (Catznip-2.6.0a) | Added: Catznip-2.1.2a
S32 idxAttachPt = 1;
if ( (!isSelf()) && (gSavedSettings.getBOOL("LegacyMultiAttachmentSupport")) && (attachmentID > 38) && (attachmentID <= 68) )
if ( (!isSelf()) && (gSavedSettings.getBOOL("LegacyMultiAttachmentSupport")) && (attachmentID > 40) && (attachmentID <= 68) )
idxAttachPt = attachmentID - 38;
attachment = get_if_there(mAttachmentPoints, idxAttachPt, (LLViewerJointAttachment*)NULL);
// [/SL:KB]