From bef76bf3c59f920a62cd34ae43f3a5327a40b696 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 20 Jul 2014 01:52:26 +0200 Subject: [PATCH] Fix duplicate attach message being sent to objects picked up from the ground --- .../CoreModules/Avatar/Attachments/AttachmentsModule.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d47ca4bfc6..0825a01638 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -715,6 +715,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments } m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero); + + // Attach (NULL) stops scripts. We don't want that. Resume them. + so.ResumeScripts(); } public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) @@ -1244,7 +1247,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments + ", AttachmentPoint: " + AttachmentPt); // Save avatar attachment information - m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId); + m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); } } catch (Exception e)