1 files changed, 57 insertions, 17 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3fcc0e8..927eeab 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -396,7 +396,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Position = position;
                 SetCallbackURL(agent, sp.Scene.RegionInfo);
 
-                UpdateAgent(reg, finalDestination, agent);
+                if (!UpdateAgent(reg, finalDestination, agent))
+                {
+                    // Region doesn't take it
+                    Fail(sp, finalDestination);
+                    return;
+                }
 
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
@@ -421,21 +426,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // that the client contacted the destination before we send the attachments and close things here.
                 if (!WaitForCallback(sp.UUID))
                 {
-                    // Client never contacted destination. Let's restore everything back
-                    sp.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
-
-                    // Fail. Reset it back
-                    sp.IsChildAgent = false;
-
-                    ResetFromTransit(sp.UUID);
-
-                    // Yikes! We should just have a ref to scene here.
-                    //sp.Scene.InformClientOfNeighbours(sp);
-                    EnableChildAgents(sp);
-
-                    // Finally, kill the agent we just created at the destination.
-                    m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
-
+                    Fail(sp, finalDestination);
                     return;
                 }
 
@@ -475,6 +466,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        private void Fail(ScenePresence sp, GridRegion finalDestination)
+        {
+            // Client never contacted destination. Let's restore everything back
+            sp.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
+
+            // Fail. Reset it back
+            sp.IsChildAgent = false;
+
+            ResetFromTransit(sp.UUID);
+
+            EnableChildAgents(sp);
+
+            // Finally, kill the agent we just created at the destination.
+            m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
+
+        }
 
         protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason)
         {
@@ -813,7 +820,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort +
                     "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
 
-                m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent);
+                if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
+                {
+                    // region doesn't take it
+                    ResetFromTransit(agent.UUID);
+                    return agent;
+                }
 
                 // Next, let's close the child agent connections that are too far away.
                 agent.CloseChildAgents(neighbourx, neighboury);
@@ -914,12 +926,40 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </summary>
         public void EnableChildAgent(ScenePresence sp, GridRegion region)
         {
+            m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
+
+            AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
             AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
             agent.BaseFolder = UUID.Zero;
             agent.InventoryFolder = UUID.Zero;
             agent.startpos = new Vector3(128, 128, 70);
             agent.child = true;
             agent.Appearance = sp.Appearance;
+            agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
+
+            agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
+            m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
+
+            if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
+                agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
+            m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
+
+            sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
+            foreach (ulong h in agent.ChildrenCapSeeds.Keys)
+                m_log.DebugFormat("[XXX] --> {0}", h);
+            m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
+            agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
+
+            if (sp.Scene.CapsModule != null)
+            {
+                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, agent.ChildrenCapSeeds);
+            }
+
+            if (currentAgentCircuit != null)
+            {
+                agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                agent.Viewer = currentAgentCircuit.Viewer;
+            }
 
             IPEndPoint external = region.ExternalEndPoint;
             if (external != null)