Allow creation of link regions if there is an existing region within a 4096 range.

Also add GetHyperlinks() to the grid service.

5 files changed, 103 insertions, 4 deletions

diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 1831533..202bad7 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -556,6 +556,56 @@ namespace OpenSim.Services.Connectors
             return rinfos;
         }
 
+        public List<GridRegion> GetHyperlinks(UUID scopeID)

+        {

+            Dictionary<string, object> sendData = new Dictionary<string, object>();

+

+            sendData["SCOPEID"] = scopeID.ToString();

+

+            sendData["METHOD"] = "get_hyperlinks";

+

+            List<GridRegion> rinfos = new List<GridRegion>();

+            string reply = string.Empty;

+            try

+            {

+                reply = SynchronousRestFormsRequester.MakeRequest("POST",

+                        m_ServerURI + "/grid",

+                        ServerUtils.BuildQueryString(sendData));

+

+                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);

+            }

+            catch (Exception e)

+            {

+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message);

+                return rinfos;

+            }

+

+            if (reply != string.Empty)

+            {

+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);

+

+                if (replyData != null)

+                {

+                    Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;

+                    foreach (object r in rinfosList)

+                    {

+                        if (r is Dictionary<string, object>)

+                        {

+                            GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);

+                            rinfos.Add(rinfo);

+                        }

+                    }

+                }

+                else

+                    m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks {0} received null response",

+                        scopeID);

+            }

+            else

+                m_log.DebugFormat("[GRID CONNECTOR]: GetHyperlinks received null reply");

+

+            return rinfos;

+        }

+        
         public virtual int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index bea8172..7bc85c6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -357,6 +357,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return new List<GridRegion>(0);
         }
 
+        public List<GridRegion> GetHyperlinks(UUID scopeID)

+        {

+            // Hypergrid/linked regions are not supported

+            return new List<GridRegion>();

+        }

+        
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             const int REGION_ONLINE = 4;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index ebaed42..79a45fe 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -426,6 +426,22 @@ namespace OpenSim.Services.GridService
             return ret;
         }
 
+        public List<GridRegion> GetHyperlinks(UUID scopeID)

+        {

+            List<GridRegion> ret = new List<GridRegion>();

+

+            List<RegionData> regions = m_Database.GetHyperlinks(scopeID);

+

+            foreach (RegionData r in regions)

+            {

+                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)

+                    ret.Add(RegionData2RegionInfo(r));

+            }

+

+            m_log.DebugFormat("[GRID SERVICE]: Hyperlinks returned {0} regions", ret.Count);

+            return ret;

+        }

+        
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             RegionData region = m_Database.Get(regionID, scopeID);
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 1f53007..017df41 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Xml;
@@ -332,18 +333,43 @@ namespace OpenSim.Services.GridService
         /// <returns></returns>
         public bool Check4096(ulong realHandle, out uint x, out uint y)
         {
-            GridRegion defRegion = DefaultRegion;
-
             uint ux = 0, uy = 0;
             Utils.LongToUInts(realHandle, out ux, out uy);
             x = ux / Constants.RegionSize;
             y = uy / Constants.RegionSize;
 
-            if ((Math.Abs((int)defRegion.RegionLocX - ux) >= 4096 * Constants.RegionSize) ||
-                (Math.Abs((int)defRegion.RegionLocY - uy) >= 4096 * Constants.RegionSize))
+            const uint limit = (4096 - 1) * Constants.RegionSize;
+            uint xmin = ux - limit;
+            uint xmax = ux + limit;
+            uint ymin = uy - limit;
+            uint ymax = uy + limit;
+            // World map boundary checks
+            if (xmin < 0 || xmin > ux)
+                xmin = 0;
+            if (xmax > int.MaxValue || xmax < ux)
+                xmax = int.MaxValue;
+            if (ymin < 0 || ymin > uy)
+                ymin = 0;
+            if (ymax > int.MaxValue || ymax < uy)
+                ymax = int.MaxValue;
+
+            // Check for any regions that are within the possible teleport range to the linked region
+            List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
+            if (regions.Count == 0)
+            {
+                return false;
+            }
+            else
+            {
+                // Check for regions which are not linked regions
+                List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
+                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+                if (availableRegions.Count() == 0)
             {
                 return false;
             }
+            }
+
             return true;
         }
 
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index e55b633..77230a3 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -92,6 +92,7 @@ namespace OpenSim.Services.Interfaces
 
         List<GridRegion> GetDefaultRegions(UUID scopeID);
         List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
+        List<GridRegion> GetHyperlinks(UUID scopeID);
 
         int GetRegionFlags(UUID scopeID, UUID regionID);
     }