From 56f60a04d943c3270819ac66a3ae80773b6352e1 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 23 Apr 2010 20:18:34 +0200
Subject: Add an additional serialization call do the detach procedure. This
 call is executed only for it's side effects, which are to block until
 attach(NULL_KEY) completes, before commencing detachment.

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index a667b80..8307467 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -405,6 +406,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (group.GetFromItemID() == itemID)
                     {
                         m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
+                        // CM / XMREngine!!!! Needed to conclude attach event
+                        SceneObjectSerializer.ToOriginalXmlFormat(group);
                         group.DetachToInventoryPrep();
                         m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
                         m_scene.UpdateKnownItem(remoteClient, group,group.GetFromItemID(), group.OwnerID);
-- 
cgit v1.1