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

Also add GetHyperlinks() to the grid service.

2 files changed, 56 insertions, 0 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;