From 01636ca90015561366130a3db9b19e4eb976b80a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Mar 2013 00:47:59 +0000
Subject: Fix teleporting into the non-SW 256x256 corner of a megaregion,
 though currently with a 10 second delay before auto-reteleport to the correct
 location.

This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f7ae3a2..f3b923f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -925,6 +925,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             AddToPhysicalScene(isFlying);
 
+            // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 
+            // location outside the 'root region' (the south-west 256x256 corner).  This is the earlist we can do it
+            // since it requires a physics actor to be present.  If it is left any later, then physics appears to reset
+            // the value to a negative position which does not trigger the border cross.
+            // This may not be the best location for this.
+            CheckForBorderCrossing();
+
             if (ForceFly)
             {
                 Flying = true;
-- 
cgit v1.1