From 4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 20 Nov 2016 04:22:00 +0000
Subject: HG LinkRegion receive region size also. Useless since olde r
 gatekeepers dont send it

---
 OpenSim/Services/GridService/HypergridLinker.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 2af617a..db33b1a 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Services.GridService
 
             mapName = mapName.Trim();
 
-            if (!mapName.StartsWith("http"))
+            if (!mapName.StartsWith("http") && !!mapName.StartsWith("https"))
             {
                 // Formats: grid.example.com:8002:region name
                 //          grid.example.com:region name
@@ -365,7 +365,9 @@ namespace OpenSim.Services.GridService
             UUID regionID = UUID.Zero;
             string externalName = string.Empty;
             string imageURL = string.Empty;
-            if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason))
+            int sizeX = (int)Constants.RegionSize;
+            int sizeY = (int)Constants.RegionSize;
+            if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason, out sizeX, out sizeY))
                 return false;
 
             if (regionID == UUID.Zero)
@@ -397,6 +399,8 @@ namespace OpenSim.Services.GridService
 //            }
 
             regInfo.RegionID = regionID;
+            regInfo.RegionSizeX = sizeX;
+            regInfo.RegionSizeY = sizeY;
 
             if (externalName == string.Empty)
                 regInfo.RegionName = regInfo.ServerURI;
-- 
cgit v1.1