Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.

ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.

6 files changed, 92 insertions, 83 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 9ea04d4..023a44c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -233,10 +233,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.GetFallbackRegions(scopeID, x, y);
         }
 
-        public List<GridRegion> GetHyperlinks(UUID scopeID)

-        {

-            return m_GridService.GetHyperlinks(scopeID);

-        }

+        public List<GridRegion> GetHyperlinks(UUID scopeID)
+        {
+            return m_GridService.GetHyperlinks(scopeID);
+        }
         
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 1366980..2726ae8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -136,9 +136,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
                 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize);
             Assert.IsNotNull(results, "Retrieved GetRegionRange list is null");
             Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
-

-            results = m_LocalConnector.GetHyperlinks(UUID.Zero);

-            Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null");

+
+            results = m_LocalConnector.GetHyperlinks(UUID.Zero);
+            Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null");
             Assert.That(results.Count, Is.EqualTo(0), "Retrieved linked regions collection is not the number expected");
 
         }
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index 202bad7..80f0d2d 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -556,55 +556,55 @@ 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 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)
         {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 7bc85c6..fefdad6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -357,11 +357,11 @@ 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 List<GridRegion> GetHyperlinks(UUID scopeID)
+        {
+            // Hypergrid/linked regions are not supported
+            return new List<GridRegion>();
+        }
         
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 79a45fe..ce6f64b 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -426,21 +426,21 @@ 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 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)
         {
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 017df41..b190f93 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Xml;
@@ -63,6 +62,7 @@ namespace OpenSim.Services.GridService
         protected GatekeeperServiceConnector m_GatekeeperConnector;
 
         protected UUID m_ScopeID = UUID.Zero;
+        protected bool m_Check4096 = true;
 
         // Hyperlink regions are hyperlinks on the map
         public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>();
@@ -117,6 +117,8 @@ namespace OpenSim.Services.GridService
                 if (scope != string.Empty)
                     UUID.TryParse(scope, out m_ScopeID);
 
+                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
+
                 m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);
 
                 m_log.DebugFormat("[HYPERGRID LINKER]: Loaded all services...");
@@ -278,7 +280,7 @@ namespace OpenSim.Services.GridService
             }
 
             uint x, y;
-            if (!Check4096(handle, out x, out y))
+            if (m_Check4096 && !Check4096(handle, out x, out y))
             {
                 RemoveHyperlinkRegion(regInfo.RegionID);
                 reason = "Region is too far (" + x + ", " + y + ")";
@@ -363,11 +365,18 @@ namespace OpenSim.Services.GridService
             {
                 // 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;
-            }
+                // would like to use .Except, but doesn't seem to exist
+                //IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+                List<GridRegion> availableRegions = regions.FindAll(delegate(GridRegion region) 
+                {
+                    // Ewww! n^2
+                    if (hyperlinks.Find(delegate(GridRegion r) { return r.RegionID == region.RegionID; }) == null) // not hyperlink. good.
+                        return true;
+
+                    return false;
+                });
+                if (availableRegions.Count == 0)
+                    return false;
             }
 
             return true;