From 6c692d2e2108eac31624b34e462b8b57b5141970 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Aug 2011 21:26:29 +0100
Subject: Fix a very recent regression from llAttachToAvatar() fix where I
 accidentally stopped normal script state persistence on login/logout and
 attach/detach

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 928d43f..afaf5c1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -560,11 +560,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
                     grp.UUID, grp.GetAttachmentPoint());
 
-                // If we're being called from a script, then trying to serialize that same script's state will not complete
-                // in any reasonable time period.  Therefore, we'll avoid it.  The worst that can happen is that if
-                // the client/server crashes rather than logging out normally, the attachment's scripts will resume
-                // without state on relog.  Arguably, this is what we want anyway.
-                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, false);
+                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
 
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
-- 
cgit v1.1