From cd4d7a7c351ad78c13805374b46ea8168568d89e Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 15 Oct 2010 07:24:57 +0200 Subject: [PATCH] A couple of more ways attachment point is sent Signed-off-by: Teravus Ovares (Dan Olivares) --- .../CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 51197d2556..2a0c0b11e6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -113,6 +113,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId)) return; + // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should + // be removed when that functionality is implemented in opensim + AttachmentPt &= 0x7f; + // Calls attach with a Zero position if (AttachObject(remoteClient, part.ParentGroup, AttachmentPt, false)) { @@ -142,6 +146,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) { + // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should + // be removed when that functionality is implemented in opensim + AttachmentPt &= 0x7f; + // If the attachment point isn't the same as the one previously used // set it's offset position = 0 so that it appears on the attachment point // and not in a weird location somewhere unknown.