From 3106a0f25e97083d63f01068a46e7ec080665351 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 26 Jun 2012 21:06:47 +0100
Subject: [PATCH] If crossing attachments into another region pre-fatpack,
 clone objects before changing properties to avoid hud display race condition
 with update threads.

This matches behaviour in fatpack crossing, where attachments are cloned before their properties are changed.
This only applies to crossings to simulators running code released before April 2011.
---
 .../EntityTransfer/EntityTransferModule.cs    | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 14d8e69d49..6cac47d70a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1660,6 +1660,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion
 
         #region Object Transfers
+
         /// <summary>
         /// Move the given scene object into a new region depending on which region its absolute position has moved
         /// into.
@@ -1961,35 +1962,43 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return successYN;
         }
 
-        protected bool CrossAttachmentsIntoNewRegion(GridRegion destination, ScenePresence sp, bool silent)
+        /// <summary>
+        /// Cross the attachments for an avatar into the destination region.
+        /// </summary>
+        /// <remarks>
+        /// This is only invoked for simulators released prior to April 2011.  Versions of OpenSimulator since then
+        /// transfer attachments in one go as part of the ChildAgentDataUpdate data passed in the update agent call.
+        /// </remarks>
+        /// <param name='destination'></param>
+        /// <param name='sp'></param>
+        /// <param name='silent'></param>
+        protected void CrossAttachmentsIntoNewRegion(GridRegion destination, ScenePresence sp, bool silent)
         {
-            List<SceneObjectGroup> m_attachments = sp.GetAttachments();
+            List<SceneObjectGroup> attachments = sp.GetAttachments();
 
-            // Validate
-//            foreach (SceneObjectGroup gobj in m_attachments)
-//            {
-//                if (gobj == null || gobj.IsDeleted)
-//                    return false;
-//            }
+//            m_log.DebugFormat(
+//                "[ENTITY TRANSFER MODULE]: Crossing {0} attachments into {1} for {2}",
+//                m_attachments.Count, destination.RegionName, sp.Name);
 
-            foreach (SceneObjectGroup gobj in m_attachments)
+            foreach (SceneObjectGroup gobj in attachments)
             {
                 // If the prim group is null then something must have happened to it!
                 if (gobj != null && !gobj.IsDeleted)
                 {
-                    // Set the parent localID to 0 so it transfers over properly.
-                    gobj.RootPart.SetParentLocalId(0);
-                    gobj.AbsolutePosition = gobj.RootPart.AttachedPos;
-                    gobj.IsAttachment = false;
+                    SceneObjectGroup clone = (SceneObjectGroup)gobj.CloneForNewScene();
+                    clone.RootPart.GroupPosition = gobj.RootPart.AttachedPos;
+                    clone.IsAttachment = false;
+
                     //gobj.RootPart.LastOwnerID = gobj.GetFromAssetID();
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending attachment {0} to region {1}", gobj.UUID, destination.RegionName);
-                    CrossPrimGroupIntoNewRegion(destination, Vector3.Zero, gobj, silent);
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: Sending attachment {0} to region {1}",
+                        clone.UUID, destination.RegionName);
+
+                    CrossPrimGroupIntoNewRegion(destination, Vector3.Zero, clone, silent);
                 }
             }
 
             sp.ClearAttachments();
-
-            return true;
         }
 
         #endregion