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

Various fixes for multi-attachments support. Ported over from https://hg.lindenlab.com/seraphlinden/seraph-viewer-for-server-1.40/

meow-7.2.2
Loren Shih 2010-04-21 17:03:04 -04:00
parent 1c352ebb5b
commit 6e4fd99df8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llagentwearables.cpp
View File

@ -1991,7 +1991,11 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
msg->nextBlockFast(_PREHASH_ObjectData );
msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
#if ENABLE_MULTIATTACHMENTS
msg->addU8Fast(_PREHASH_AttachmentPt, 0 | ATTACHMENT_ADD );
#else
msg->addU8Fast(_PREHASH_AttachmentPt, 0 ); // Wear at the previous or default attachment point
#endif
pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
msg->addStringFast(_PREHASH_Name, item->getName());
msg->addStringFast(_PREHASH_Description, item->getDescription());

6
indra/newview/llselectmgr.cpp
View File

@ -3624,14 +3624,14 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
return;
}
#if ENABLE_MULTIATTACHMENTS
attachment_point |= ATTACHMENT_ADD;
#endif
BOOL build_mode = LLToolMgr::getInstance()->inEdit();
// Special case: Attach to default location for this object.
if (0 == attachment_point ||
get_if_there(gAgentAvatarp->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL))
{
#if ENABLE_MULTIATTACHMENTS
attachment_point |= ATTACHMENT_ADD;
#endif
sendListToRegions(
"ObjectAttach",
packAgentIDAndSessionAndAttachment,