14 files changed, 153 insertions, 185 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 8a1f267..77b07ed 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1512,6 +1512,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                         bool tp = (aCircuit.teleportFlags > 0);
+                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
                         if (!tp)
                             client.SceneAgent.SendInitialDataToMe();
                     }
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 2fc3b1c..6ce6227 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -127,25 +127,27 @@ namespace OpenSim.Region.CoreModules.Framework
             Caps caps;
             String capsObjectPath = GetCapsPath(agentId);
 
-            if (m_capsObjects.ContainsKey(circuitCode))
+            lock (m_capsObjects)
             {
-                Caps oldCaps = m_capsObjects[circuitCode];
-                
-                m_log.DebugFormat(
-                    "[CAPS]: Recreating caps for agent {0}.  Old caps path {1}, new caps path {2}. ", 
-                    agentId, oldCaps.CapsObjectPath, capsObjectPath);
-                // This should not happen. The caller code is confused. We need to fix that.
-                // CAPs can never be reregistered, or the client will be confused.
-                // Hence this return here.
-                //return;
-            }
-
-            caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
-                    (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
-                    capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
+                if (m_capsObjects.ContainsKey(circuitCode))
+                {
+                    Caps oldCaps = m_capsObjects[circuitCode];
+                    
+                    m_log.DebugFormat(
+                        "[CAPS]: Recreating caps for agent {0}.  Old caps path {1}, new caps path {2}. ", 
+                        agentId, oldCaps.CapsObjectPath, capsObjectPath);
+                    // This should not happen. The caller code is confused. We need to fix that.
+                    // CAPs can never be reregistered, or the client will be confused.
+                    // Hence this return here.
+                    //return;
+                }
 
-            m_capsObjects[circuitCode] = caps;
+                caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
+                        (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
+                        capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
 
+                m_capsObjects[circuitCode] = caps;
+            }
             m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
         }
 
@@ -301,7 +303,7 @@ namespace OpenSim.Region.CoreModules.Framework
             {
                 foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
                 {
-                    caps.AppendFormat("** User {0}:\n", kvp.Key);
+                    caps.AppendFormat("** Circuit {0}:\n", kvp.Key);
 
                     for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
                     {
@@ -345,7 +347,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private void BuildDetailedStatsByCapReport(StringBuilder sb, string capName)
         {
-        /*
+            /*
             sb.AppendFormat("Capability name {0}\n", capName);
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
@@ -387,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private void BuildSummaryStatsByCapReport(StringBuilder sb)
         {
-        /*
+            /*
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("Name", 34);
             cdt.AddColumn("Req Received", 12);
@@ -434,6 +436,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private void HandleShowCapsStatsByUserCommand(string module, string[] cmdParams)
         {
+            /*
             if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
                 return;
 
@@ -464,6 +467,7 @@ namespace OpenSim.Region.CoreModules.Framework
             }
 
             MainConsole.Instance.Output(sb.ToString());
+            */
         }
 
         private void BuildDetailedStatsByUserReport(StringBuilder sb, ScenePresence sp)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index b9c88d4..a3c539d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -822,7 +822,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}.  Keeping avatar in source region.",
                     sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
                 
-                Fail(sp, finalDestination, logout, "Connection between viewer and destination region could not be established.");
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
                 return;
             }
 
@@ -834,7 +834,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after UpdateAgent on client request", 
                     sp.Name, finalDestination.RegionName, sp.Scene.Name);
 
-                CleanupFailedInterRegionTeleport(sp, finalDestination);
+                CleanupFailedInterRegionTeleport(sp, currentAgentCircuit.SessionID.ToString(), finalDestination);
 
                 return;
             }
@@ -878,7 +878,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} from {2} failed due to no callback from destination region.  Returning avatar to source region.",
                     sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
                 
-                Fail(sp, finalDestination, logout, "Destination region did not signal teleport completion.");
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
 
                 return;
             }
@@ -932,7 +932,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <remarks>
         /// <param name='sp'> </param>
         /// <param name='finalDestination'></param>
-        protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, GridRegion finalDestination)
+        protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination)
         {
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
@@ -943,7 +943,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // Finally, kill the agent we just created at the destination.
             // XXX: Possibly this should be done asynchronously.
-            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID);
+            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID, auth_token);
         }
 
         /// <summary>
@@ -953,9 +953,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name='finalDestination'></param>
         /// <param name='logout'></param>
         /// <param name='reason'>Human readable reason for teleport failure.  Will be sent to client.</param>
-        protected virtual void Fail(ScenePresence sp, GridRegion finalDestination, bool logout, string reason)
+        protected virtual void Fail(ScenePresence sp, GridRegion finalDestination, bool logout, string auth_code, string reason)
         {
-            CleanupFailedInterRegionTeleport(sp, finalDestination);
+            CleanupFailedInterRegionTeleport(sp, auth_code, finalDestination);
 
             m_interRegionTeleportFailures.Value++;
 
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 975fccf..1cf1884 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -207,6 +207,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
                 m_UAS = scene.RequestModuleInterface<IUserAgentService>();
+                if (m_UAS == null)
+                    m_UAS = new UserAgentServiceConnector(m_ThisHomeURI);
+
             }
         }
 
@@ -571,12 +574,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
             {
                 // local grid user
+                m_UAS.LogoutAgent(obj.AgentId, obj.SessionId);
                 return;
             }
 
             AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
-
-            if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+            if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("HomeURI"))
             {
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e4aa7bc..8207fb9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -250,26 +250,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
-        public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
-        {
-            agent = null;
-            
-            if (destination == null)
-                return false;
-
-            if (m_scenes.ContainsKey(destination.RegionID))
-            {
-//                    m_log.DebugFormat(
-//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
-//                        s.RegionInfo.RegionName, destination.RegionHandle);
-
-                return m_scenes[destination.RegionID].IncomingRetrieveRootAgent(id, out agent);
-            }
-
-            //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
-            return false;
-        }
-
         public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason)
         {
             reason = "Communications failure";
@@ -306,12 +286,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool CloseChildAgent(GridRegion destination, UUID id)
-        {
-            return CloseAgent(destination, id);
-        }
-
-        public bool CloseAgent(GridRegion destination, UUID id)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
                 return false;
@@ -322,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
 
-                m_scenes[destination.RegionID].IncomingCloseAgent(id, false);
+                m_scenes[destination.RegionID].IncomingCloseAgent(id, false, auth_token);
                 return true;
             }
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f7dae59..a1ab3e3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -212,24 +212,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
-        public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
-        {
-            agent = null;
-
-            if (destination == null)
-                return false;
-
-            // Try local first
-            if (m_localBackend.RetrieveAgent(destination, id, out agent))
-                return true;
-
-            // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionID))
-                return m_remoteConnector.RetrieveAgent(destination, id, out agent);
-
-            return false;
-        }
-
         public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason)
         {
             reason = "Communications failure";
@@ -262,34 +244,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool CloseChildAgent(GridRegion destination, UUID id)
-        {
-            if (destination == null)
-                return false;
-
-            // Try local first
-            if (m_localBackend.CloseChildAgent(destination, id))
-                return true;
-
-            // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
-                return m_remoteConnector.CloseChildAgent(destination, id);
-
-            return false;
-        }
-
-        public bool CloseAgent(GridRegion destination, UUID id)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
                 return false;
 
             // Try local first
-            if (m_localBackend.CloseAgent(destination, id))
+            if (m_localBackend.CloseAgent(destination, id, auth_token))
                 return true;
 
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
-                return m_remoteConnector.CloseAgent(destination, id);
+                return m_remoteConnector.CloseAgent(destination, id, auth_token);
             
             return false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d293a8b..c132c5d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3609,7 +3609,7 @@ namespace OpenSim.Region.Framework.Scenes
                         regions.Remove(RegionInfo.RegionHandle);
 
                         // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
-                        m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
+                        m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.SessionID.ToString(), regions);
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
@@ -3856,7 +3856,6 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.WarnFormat(
                         "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
                         sp.Name, sp.UUID, RegionInfo.RegionName);
-
     
                     if (sp.ControllingClient != null)
                         sp.ControllingClient.Close(true, true);
@@ -4395,10 +4394,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (childAgentUpdate != null)
             {
+                if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
+                {
+                    m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).", childAgentUpdate.UUID, cAgentData.SessionID);
+                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
+                        childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
+                }
+
                 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
                 return true;
             }
-
             return false;
         }
 
@@ -4414,20 +4419,24 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
-                // I can't imagine *yet* why we would get an update if the agent is a root agent..
-                // however to avoid a race condition crossing borders..
-                if (childAgentUpdate.IsChildAgent)
-                {
-                    uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
-                    uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
-                    uint tRegionX = RegionInfo.RegionLocX;
-                    uint tRegionY = RegionInfo.RegionLocY;
-                    //Send Data to ScenePresence
-                    childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
-                    // Not Implemented:
-                    //TODO: Do we need to pass the message on to one of our neighbors?
+                if (childAgentUpdate.ControllingClient.SessionId == cAgentData.SessionID)
+                {
+                    // I can't imagine *yet* why we would get an update if the agent is a root agent..
+                    // however to avoid a race condition crossing borders..
+                    if (childAgentUpdate.IsChildAgent)
+                    {
+                        uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
+                        uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
+                        uint tRegionX = RegionInfo.RegionLocX;
+                        uint tRegionY = RegionInfo.RegionLocY;
+                        //Send Data to ScenePresence
+                        childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
+                        // Not Implemented:
+                        //TODO: Do we need to pass the message on to one of our neighbors?
+                    }
                 }
-
+                else
+                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
                 return true;
             }
 
@@ -4470,6 +4479,25 @@ namespace OpenSim.Region.Framework.Scenes
 
             return false;
         }
+        /// <summary>
+        /// Authenticated close (via network)
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="force"></param>
+        /// <param name="auth_token"></param>
+        /// <returns></returns>
+        public bool IncomingCloseAgent(UUID agentID, bool force, string auth_token)
+        {
+            //m_log.DebugFormat("[SCENE]: Processing incoming close agent {0} in region {1} with auth_token {2}", agentID, RegionInfo.RegionName, auth_token);
+
+            // Check that the auth_token is valid
+            AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID);
+            if (acd != null && acd.SessionID.ToString() == auth_token)
+                return IncomingCloseAgent(agentID, force);
+            else
+                m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token);
+            return false;
+        }
 
         public bool IncomingCloseAgent(UUID agentID)
         {
@@ -4492,7 +4520,6 @@ namespace OpenSim.Region.Framework.Scenes
         public bool IncomingCloseAgent(UUID agentID, bool force)
         {
             //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
-
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
             {
@@ -4500,7 +4527,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return true;
             }
 
-            // Agent not here
+            // Agent not here 
             return false;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index df61dde..52f46f2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// This Closes child agents on neighboring regions
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
+        protected void SendCloseChildAgent(UUID agentID, ulong regionHandle, string auth_token)
         {
             // let's do our best, but there's not much we can do if the neighbour doesn't accept.
 
@@ -209,24 +209,25 @@ namespace OpenSim.Region.Framework.Scenes
             Utils.LongToUInts(regionHandle, out x, out y);
 
             GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
-            m_scene.SimulationService.CloseChildAgent(destination, agentID);
-        }
 
-        private void SendCloseChildAgentCompleted(IAsyncResult iar)
-        {
-            SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
-            icon.EndInvoke(iar);
+            m_log.DebugFormat(
+                "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName);
+
+            m_scene.SimulationService.CloseAgent(destination, agentID, auth_token);
         }
 
-        public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
+        /// <summary>
+        /// Closes a child agents in a collection of regions. Does so asynchronously 
+        /// so that the caller doesn't wait.
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="regionslst"></param>
+        public void SendCloseChildAgentConnections(UUID agentID, string auth_code, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
             {
                 ulong handleCopy = handle;
-                SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
-                d.BeginInvoke(agentID, handleCopy,
-                              SendCloseChildAgentCompleted,
-                              d);
+                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); });
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2594b1b..59a453a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4704,50 +4704,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Subscribe for physics collision events if needed for scripts and sounds
-        /// </summary>
-        public void SubscribeForCollisionEvents()
-        {
-            PhysicsActor pa = PhysActor;
-
-            if (pa != null)
-            {
-                if (
-                    ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                    ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                    ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                    ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                    ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                    ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                    (CollisionSound != UUID.Zero)
-                    )
-                {
-                    if (!pa.SubscribedEvents())
-                    {
-                        // If not already subscribed for event, set up for a collision event.
-                        pa.OnCollisionUpdate += PhysicsCollision;
-                        pa.SubscribeEvents(1000);
-                    }
-                }
-                else
-                {
-                    // There is no need to be subscribed to collisions so, if subscribed, remove subscription
-                    if (pa.SubscribedEvents())
-                    {
-                        pa.OnCollisionUpdate -= PhysicsCollision;
-                        pa.UnSubscribeEvents();
-                    }
-                }
-            }
-        }
-
-        /// <summary>
         /// Adds this part to the physics scene.
         /// and sets the PhysActor property
         /// </summary>
@@ -5205,7 +5161,31 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop;
             }
-
+/*
+            PhysicsActor pa = PhysActor;
+            if (pa != null)
+            {
+                if (
+//                    ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+                    ((AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || ((ParentGroup.RootPart.AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || (CollisionSound != UUID.Zero)
+                    )
+                {
+                    // subscribe to physics updates.
+                    pa.OnCollisionUpdate += PhysicsCollision;
+                    pa.SubscribeEvents(1000);
+                }
+                else
+                {
+                    pa.UnSubscribeEvents();
+                    pa.OnCollisionUpdate -= PhysicsCollision;
+                }
+            }
+ */
             UpdatePhysicsSubscribedEvents();
 
             //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4ae0eb1..6e4ac98 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1151,9 +1151,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             MovementFlag = 0;
 
-            m_scene.EventManager.TriggerOnMakeRootAgent(this);
-
-            m_scene.EventManager.OnRegionHeartbeatEnd += RegionHeartbeatEnd;
+            // DIVA NOTE: I moved TriggerOnMakeRootAgent out of here and into the end of
+            // CompleteMovement. We don't want modules doing heavy computation before CompleteMovement
+            // is over.
         }
 
         public int GetStateSource()
@@ -1519,10 +1519,15 @@ namespace OpenSim.Region.Framework.Scenes
             bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
             MakeRootAgent(AbsolutePosition, flying);
             ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
+            // Remember in HandleUseCircuitCode, we delayed this to here
+            // This will also send the initial data to clients when TP to a neighboring region. 
+            // Not ideal, but until we know we're TP-ing from a neighboring region, there's not much we can do
+            if (m_teleportFlags > 0)
+                SendInitialDataToMe();
 
 //            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
 
-            if ((m_callbackURI != null) && !m_callbackURI.Equals(""))
+            if (!string.IsNullOrEmpty(m_callbackURI))
             {
                 // We cannot sleep here since this would hold up the inbound packet processing thread, as
                 // CompleteMovement() is executed synchronously.  However, it might be better to delay the release
@@ -1550,9 +1555,6 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
-                // Remember in HandleUseCircuitCode, we delayed this to here
-                SendInitialDataToMe();
-
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     m_agentTransfer.EnableChildAgents(this);
@@ -1575,6 +1577,11 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+
+            // DIVA NOTE: moved this here from MakeRoot. We don't want modules making heavy
+            // computations before CompleteMovement is over
+            m_scene.EventManager.TriggerOnMakeRootAgent(this);
+
         }
 
         /// <summary>
@@ -2886,11 +2893,12 @@ namespace OpenSim.Region.Framework.Scenes
                 SendOtherAgentsAppearanceToMe();
 
                 EntityBase[] entities = Scene.Entities.GetEntities();
-                foreach(EntityBase e in entities)
+                foreach (EntityBase e in entities)
                 {
                     if (e != null && e is SceneObjectGroup)
                         ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                 }
+
             });
         }
 
@@ -3116,7 +3124,7 @@ namespace OpenSim.Region.Framework.Scenes
                 cadu.Velocity = Velocity;
 
                 AgentPosition agentpos = new AgentPosition();
-                agentpos.CopyFrom(cadu);
+                agentpos.CopyFrom(cadu, ControllingClient.SessionId);
 
                 // Let's get this out of the update loop
                 Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
@@ -3355,7 +3363,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
 
-                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); 
+                AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(UUID);
+                string auth = string.Empty;
+                if (acd != null)
+                    auth = acd.SessionID.ToString();
+                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, auth, byebyeRegions); 
             }
             
             foreach (ulong handle in byebyeRegions)
@@ -3456,6 +3468,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.AgentID = UUID;
             cAgent.RegionID = Scene.RegionInfo.RegionID;
+            cAgent.SessionID = ControllingClient.SessionId;
 
             cAgent.Position = AbsolutePosition;
             cAgent.Velocity = m_velocity;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 5a72239..5df9aba 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             //moveArgs.BodyRotation = Quaternion.CreateFromEulers(Vector3.Zero);
             moveArgs.BodyRotation = Quaternion.CreateFromEulers(new Vector3(0, 0, (float)-(Math.PI / 2)));
             moveArgs.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS;
+            moveArgs.SessionID = acd.SessionID;
 
             originalSp.HandleAgentUpdate(originalSp.ControllingClient, moveArgs);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index a6db2e5..44a7c14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -353,12 +353,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // Position of a sensor in a child prim attached to an avatar
                 // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
-                fromRegionPos = avatar.AbsolutePosition;
-                q = avatar.Rotation;
 
                 // Don't proceed if the avatar for this attachment has since been removed from the scene.
                 if (avatar == null)
                     return sensedEntities;
+
+                fromRegionPos = avatar.AbsolutePosition;
+                q = avatar.Rotation;
             }
 
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -487,6 +488,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // Position of a sensor in a child prim attached to an avatar
                 // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
+
+                // Don't proceed if the avatar for this attachment has since been removed from the scene.
                 if (avatar == null)
                     return sensedEntities;
                 fromRegionPos = avatar.AbsolutePosition;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index b25894a..d211a2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -343,7 +343,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetDamage(double damage);
               void llSetForce(LSL_Vector force, int local);
               void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
-              void llSetVelocity(LSL_Vector velocity, int local);
               void llSetAngularVelocity(LSL_Vector angularVelocity, int local);
               void llSetHoverHeight(double height, int water, double tau);
               void llSetInventoryPermMask(string item, int mask, int value);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 2f528af..4fc8d65 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1550,11 +1550,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetForceAndTorque(force, torque, local);
         }
 
-        public void llSetVelocity(LSL_Vector force, int local)
-        {
-            m_LSL_Functions.llSetVelocity(force, local);
-        }
-
         public void llSetAngularVelocity(LSL_Vector force, int local)
         {
             m_LSL_Functions.llSetAngularVelocity(force, local);