* Switch border cross tests over to the new Border class.

* Use List<Border> for each cardinal to allow for irregular regions.

1 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5281c4f..aae1823 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2830,27 +2830,28 @@ namespace OpenSim.Region.Framework.Scenes
             if (!IsInTransit)
             {
                 // Checks if where it's headed exists a region
-                if (pos2.X < 0)
+
+                if (m_scene.TestBorderCross(pos2, Cardinals.W))
                 {
-                    if (pos2.Y < 0)
+                    if (m_scene.TestBorderCross(pos2, Cardinals.S))
                         neighbor = HaveNeighbor(Cardinals.SW, ref fix);
-                    else if (pos2.Y > Constants.RegionSize)
+                    else if (m_scene.TestBorderCross(pos2, Cardinals.N))
                         neighbor = HaveNeighbor(Cardinals.NW, ref fix);
                     else
                         neighbor = HaveNeighbor(Cardinals.W, ref fix);
                 }
-                else if (pos2.X > Constants.RegionSize)
+                else if (m_scene.TestBorderCross(pos2, Cardinals.E))
                 {
-                    if (pos2.Y < 0)
+                    if (m_scene.TestBorderCross(pos2, Cardinals.S))
                         neighbor = HaveNeighbor(Cardinals.SE, ref fix);
-                    else if (pos2.Y > Constants.RegionSize)
+                    else if (m_scene.TestBorderCross(pos2, Cardinals.N))
                         neighbor = HaveNeighbor(Cardinals.NE, ref fix);
                     else
                         neighbor = HaveNeighbor(Cardinals.E, ref fix);
                 }
-                else if (pos2.Y < 0)
+                else if (m_scene.TestBorderCross(pos2, Cardinals.S))
                     neighbor = HaveNeighbor(Cardinals.S, ref fix);
-                else if (pos2.Y > Constants.RegionSize)
+                else if (m_scene.TestBorderCross(pos2, Cardinals.N))
                     neighbor = HaveNeighbor(Cardinals.N, ref fix);
 
                 // Makes sure avatar does not end up outside region