Fix duplicate attach message being sent to objects picked up from the ground

avinationmerge
Melanie Thielker 2014-07-20 01:52:26 +02:00
parent 5000a5c038
commit bef76bf3c5
1 changed files with 4 additions and 1 deletions

View File

@ -715,6 +715,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
} }
m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero); 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) public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
@ -1244,7 +1247,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
+ ", AttachmentPoint: " + AttachmentPt); + ", AttachmentPoint: " + AttachmentPt);
// Save avatar attachment information // Save avatar attachment information
m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId); m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
} }
} }
catch (Exception e) catch (Exception e)