From ab59c0a658c25f129255198f27704cdbbcb13d6b Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 25 May 2012 03:39:10 +0100
Subject: [PATCH] on agent cross, remove from physics scene after its been
 placed in transit, not before.

---
 .../Framework/EntityTransfer/EntityTransferModule.cs   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7295383cd0..a5fb0c2fb5 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1111,6 +1111,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             try
             {
+                SetInTransit(agent.UUID);
+
                 ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
     
                 m_log.DebugFormat(
@@ -1129,8 +1131,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 agent.RemoveFromPhysicalScene();
 
-                SetInTransit(agent.UUID);
-
                 AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
                 cAgent.Position = pos;
@@ -1146,9 +1146,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                 {
                     // region doesn't take it
+                    UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+
                     ReInstantiateScripts(agent);
                     agent.AddToPhysicalScene(isFlying);
                     ResetFromTransit(agent.UUID);
+
                     return agent;
                 }
 
@@ -1208,7 +1211,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
                 }
 
-
                 // Next, let's close the child agent connections that are too far away.
                 agent.CloseChildAgents(neighbourx, neighboury);
 
@@ -1232,6 +1234,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.ErrorFormat(
                     "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2}.  Exception {3}{4}",
                     agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
+
+                // TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
             }
 
             return agent;