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.

2 files changed, 54 insertions, 54 deletions

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)
         {