1 files changed, 335 insertions, 19 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6118a70..3e573cf 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -81,6 +81,13 @@ namespace OpenSim.Region.Framework.Scenes
         protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
         protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
 
+        public volatile bool BordersLocked = false;
+
+        public List<Border> NorthBorders = new List<Border>();
+        public List<Border> EastBorders = new List<Border>();
+        public List<Border> SouthBorders = new List<Border>();
+        public List<Border> WestBorders = new List<Border>();
+
         /// <value>
         /// The scene graph for this scene
         /// </value>
@@ -326,6 +333,31 @@ namespace OpenSim.Region.Framework.Scenes
             m_config = config;
 
             Random random = new Random();
+            
+            BordersLocked = true;
+
+            Border northBorder = new Border();
+            northBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize);  //<---
+            northBorder.CrossDirection = Cardinals.N;
+            NorthBorders.Add(northBorder);
+
+            Border southBorder = new Border();
+            southBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0);    //--->
+            southBorder.CrossDirection = Cardinals.S;
+            SouthBorders.Add(southBorder);
+
+            Border eastBorder = new Border();
+            eastBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize);   //<---
+            eastBorder.CrossDirection = Cardinals.E;
+            EastBorders.Add(eastBorder);
+
+            Border westBorder = new Border();
+            westBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0);     //--->
+            westBorder.CrossDirection = Cardinals.W;
+            WestBorders.Add(westBorder);
+
+            BordersLocked = false;
+
             m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4);
             m_moduleLoader = moduleLoader;
             m_authenticateHandler = authen;
@@ -455,6 +487,28 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="regInfo"></param>
         public Scene(RegionInfo regInfo)
         {
+            BordersLocked = true;
+            Border northBorder = new Border();
+            northBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize);  //<---
+            northBorder.CrossDirection = Cardinals.N;
+            NorthBorders.Add(northBorder);
+
+            Border southBorder = new Border();
+            southBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0);    //--->
+            southBorder.CrossDirection = Cardinals.S;
+            SouthBorders.Add(southBorder);
+
+            Border eastBorder = new Border();
+            eastBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize);   //<---
+            eastBorder.CrossDirection = Cardinals.E;
+            EastBorders.Add(eastBorder);
+
+            Border westBorder = new Border();
+            westBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0);     //--->
+            westBorder.CrossDirection = Cardinals.W;
+            WestBorders.Add(westBorder);
+            BordersLocked = false;
+
             m_regInfo = regInfo;
             m_eventManager = new EventManager();
         }
@@ -1659,35 +1713,86 @@ namespace OpenSim.Region.Framework.Scenes
             ulong newRegionHandle = 0;
             Vector3 pos = attemptedPosition;
 
-            if (attemptedPosition.X > Constants.RegionSize + 0.1f)
+            if (TestBorderCross(attemptedPosition, Cardinals.W))
             {
-                pos.X = ((pos.X - Constants.RegionSize));
-                newRegionHandle
-                    = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize));
-                // x + 1
+                if (TestBorderCross(attemptedPosition, Cardinals.S))
+                {
+                    //Border crossedBorderx = GetCrossedBorder(attemptedPosition,Cardinals.W);
+                    //Border crossedBordery = GetCrossedBorder(attemptedPosition, Cardinals.S);
+                    //(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize)
+                    pos.X = ((pos.X + Constants.RegionSize));
+                    pos.Y = ((pos.Y + Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint)((thisx - 1) * Constants.RegionSize),
+                                           (uint)((thisy - 1) * Constants.RegionSize));
+                    // x - 1
+                    // y - 1
+                }
+                else if (TestBorderCross(attemptedPosition, Cardinals.N))
+                {
+                    pos.X = ((pos.X + Constants.RegionSize));
+                    pos.Y = ((pos.Y - Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint)((thisx - 1) * Constants.RegionSize),
+                                           (uint)((thisy + 1) * Constants.RegionSize));
+                    // x - 1
+                    // y + 1
+                }
+                else
+                {
+                    pos.X = ((pos.X + Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint) ((thisx - 1)*Constants.RegionSize),
+                                           (uint) (thisy*Constants.RegionSize));
+                    // x - 1
+                }
             }
-            else if (attemptedPosition.X < -0.1f)
+            else if (TestBorderCross(attemptedPosition, Cardinals.E))
+            {
+                if (TestBorderCross(attemptedPosition, Cardinals.S))
+                {
+                    pos.X = ((pos.X - Constants.RegionSize));
+                    pos.Y = ((pos.Y + Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize),
+                                           (uint)((thisy - 1) * Constants.RegionSize));
+                    // x + 1
+                    // y - 1
+                }
+                else if (TestBorderCross(attemptedPosition, Cardinals.N))
+                {
+                    pos.X = ((pos.X - Constants.RegionSize));
+                    pos.Y = ((pos.Y - Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize),
+                                           (uint)((thisy + 1) * Constants.RegionSize));
+                    // x + 1
+                    // y + 1
+                }
+                else
+                {
+                    pos.X = ((pos.X - Constants.RegionSize));
+                    newRegionHandle
+                        = Util.UIntsToLong((uint) ((thisx + 1)*Constants.RegionSize),
+                                           (uint) (thisy*Constants.RegionSize));
+                    // x + 1
+                }
+            } 
+            else if (TestBorderCross(attemptedPosition, Cardinals.S))
             {
-                pos.X = ((pos.X + Constants.RegionSize));
+                pos.Y = ((pos.Y + Constants.RegionSize));
                 newRegionHandle
-                    = Util.UIntsToLong((uint)((thisx - 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize));
-                // x - 1
+                    = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy - 1) * Constants.RegionSize));
+                // y - 1
             }
-
-            if (attemptedPosition.Y > Constants.RegionSize + 0.1f)
+            else if (TestBorderCross(attemptedPosition, Cardinals.N))
             {
+                
                 pos.Y = ((pos.Y - Constants.RegionSize));
                 newRegionHandle
                     = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy + 1) * Constants.RegionSize));
                 // y + 1
             }
-            else if (attemptedPosition.Y < -0.1f)
-            {
-                pos.Y = ((pos.Y + Constants.RegionSize));
-                newRegionHandle
-                    = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy - 1) * Constants.RegionSize));
-                // y - 1
-            }
 
             // Offset the positions for the new region across the border
             Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
@@ -1701,6 +1806,186 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public Border GetCrossedBorder(Vector3 position, Cardinals gridline)
+        {
+            if (BordersLocked)
+            {
+                switch (gridline)
+                {
+                    case Cardinals.N:
+                        lock (NorthBorders)
+                        {
+                            foreach (Border b in NorthBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return b;
+                            }
+                        }
+                        break;
+                    case Cardinals.S:
+                        lock (SouthBorders)
+                        {
+                            foreach (Border b in SouthBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return b;
+                            }
+                        }
+
+                        break;
+                    case Cardinals.E:
+                        lock (EastBorders)
+                        {
+                            foreach (Border b in EastBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return b;
+                            }
+                        }
+
+                        break;
+                    case Cardinals.W:
+
+                        lock (WestBorders)
+                        {
+                            foreach (Border b in WestBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return b;
+                            }
+                        }
+                        break;
+
+                }
+            }
+            else
+            {
+                switch (gridline)
+                {
+                    case Cardinals.N:
+                        foreach (Border b in NorthBorders)
+                        {
+                            if (b.TestCross(position))
+                                return b;
+                        }
+                       
+                        break;
+                    case Cardinals.S:
+                        foreach (Border b in SouthBorders)
+                        {
+                            if (b.TestCross(position))
+                                return b;
+                        }
+                        break;
+                    case Cardinals.E:
+                        foreach (Border b in EastBorders)
+                        {
+                            if (b.TestCross(position))
+                                return b;
+                        }
+
+                        break;
+                    case Cardinals.W:
+                        foreach (Border b in WestBorders)
+                        {
+                            if (b.TestCross(position))
+                                return b;
+                        }
+                        break;
+
+                }
+            }
+            
+
+            return null;
+        }
+
+        public bool TestBorderCross(Vector3 position, Cardinals border)
+        {
+            if (BordersLocked)
+            {
+                switch (border)
+                {
+                    case Cardinals.N:
+                        lock (NorthBorders)
+                        {
+                            foreach (Border b in NorthBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return true;
+                            }
+                        }
+                        break;
+                    case Cardinals.E:
+                        lock (EastBorders)
+                        {
+                            foreach (Border b in EastBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return true;
+                            }
+                        }
+                        break;
+                    case Cardinals.S:
+                        lock (SouthBorders)
+                        {
+                            foreach (Border b in SouthBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return true;
+                            }
+                        }
+                        break;
+                    case Cardinals.W:
+                        lock (WestBorders)
+                        {
+                            foreach (Border b in WestBorders)
+                            {
+                                if (b.TestCross(position))
+                                    return true;
+                            }
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                switch (border)
+                {
+                    case Cardinals.N:
+                        foreach (Border b in NorthBorders)
+                        {
+                            if (b.TestCross(position))
+                                return true;
+                        }
+                        break;
+                    case Cardinals.E:
+                        foreach (Border b in EastBorders)
+                        {
+                            if (b.TestCross(position))
+                                return true;
+                        }
+                        break;
+                    case Cardinals.S:
+                        foreach (Border b in SouthBorders)
+                        {
+                            if (b.TestCross(position))
+                                return true;
+                        }
+                        break;
+                    case Cardinals.W:                     
+                        foreach (Border b in WestBorders)
+                        {
+                            if (b.TestCross(position))
+                                return true;
+                        }                       
+                        break;
+                }
+            }
+            return false;
+        }
+
+
         /// <summary>
         /// Move the given scene object into a new region
         /// </summary>
@@ -3063,16 +3348,47 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (sp != null)
             {
+                uint regionX = m_regInfo.RegionLocX;
+                uint regionY = m_regInfo.RegionLocY;
+
+                Utils.LongToUInts(regionHandle, out regionX, out regionY);
+
+                int shiftx = (int) regionX - (int) m_regInfo.RegionLocX * (int)Constants.RegionSize;
+                int shifty = (int)regionY - (int)m_regInfo.RegionLocY * (int)Constants.RegionSize;
+
+                position.X += shiftx;
+                position.Y += shifty;
+
+                bool result = false;
+
+                if (TestBorderCross(position,Cardinals.N))
+                    result = true;
+
+                if (TestBorderCross(position, Cardinals.S))
+                    result = true;
+
+                if (TestBorderCross(position, Cardinals.E))
+                    result = true;
+
+                if (TestBorderCross(position, Cardinals.W))
+                    result = true;
+
+                // bordercross if position is outside of region
+
+                if (!result)
+                    regionHandle = m_regInfo.RegionHandle;
+
                 if (m_teleportModule != null)
                 {
                     m_teleportModule.RequestTeleportToLocation(sp, regionHandle,
-                                                                 position, lookAt, teleportFlags);
+                                                               position, lookAt, teleportFlags);
                 }
                 else
                 {
                     m_sceneGridService.RequestTeleportToLocation(sp, regionHandle,
                                                                  position, lookAt, teleportFlags);
                 }
+               
             }
         }