3 files changed, 20 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index b985fbb..e380067 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1759,11 +1759,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected void ReInstantiateScripts(ScenePresence sp)
         {
+            int i = 0;
             sp.Attachments.ForEach(delegate(SceneObjectGroup sog)
             {
+                sog.SetState(sp.InTransitScriptStates[i++], sp.Scene);
                 sog.CreateScriptInstances(0, false, sp.Scene.DefaultScriptEngine, 0);
                 sog.ResumeScripts();
             });
+
+            sp.InTransitScriptStates.Clear();
         }
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 6b3df9d..1370b1f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -371,7 +371,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
 
             // This is a hook to do some per-asset post-processing for subclasses that need that
-            ExportAsset(remoteClient.AgentId, assetID);
+            if (remoteClient != null)
+                ExportAsset(remoteClient.AgentId, assetID);
             
             return assetID;
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e90d56..631c91b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -232,6 +232,16 @@ namespace OpenSim.Region.Framework.Scenes
         private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>();
 
         /// <summary>
+        /// Copy of the script states while the agent is in transit. This state may
+        /// need to be placed back in case of transfer fail.
+        /// </summary>
+        public List<string> InTransitScriptStates
+        {
+            get { return m_InTransitScriptStates; }
+        }
+        private List<string> m_InTransitScriptStates = new List<string>();
+
+        /// <summary>
         /// Implemented Control Flags
         /// </summary>
         private enum Dir_ControlFlags
@@ -3142,6 +3152,7 @@ namespace OpenSim.Region.Framework.Scenes
                 cAgent.AttachmentObjects = new List<ISceneObject>();
                 cAgent.AttachmentObjectStates = new List<string>();
                 IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
+                m_InTransitScriptStates.Clear();
                 foreach (SceneObjectGroup sog in m_attachments)
                 {
                     // We need to make a copy and pass that copy
@@ -3151,7 +3162,9 @@ namespace OpenSim.Region.Framework.Scenes
                     ((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
                     ((SceneObjectGroup)clone).RootPart.IsAttachment = false;
                     cAgent.AttachmentObjects.Add(clone);
-                    cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot());
+                    string state = sog.GetStateSnapshot();
+                    cAgent.AttachmentObjectStates.Add(state);
+                    m_InTransitScriptStates.Add(state);
                     // Let's remove the scripts of the original object here
                     sog.RemoveScriptInstances(true);
                 }