aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
authorUbitUmarov2016-11-20 04:22:00 +0000
committerUbitUmarov2016-11-20 04:22:00 +0000
commit4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b (patch)
treeedb7affd173838c470900ccc3179a8db3d63128d /OpenSim/Services/GridService
parentHG LinkRegion sends region size also (diff)
downloadopensim-SC_OLD-4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b.zip
opensim-SC_OLD-4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b.tar.gz
opensim-SC_OLD-4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b.tar.bz2
opensim-SC_OLD-4c2ece3bcb7a28c746ef42b7cc6939571e0ede3b.tar.xz
HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs8
1 files changed, 6 insertions, 2 deletions
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
198 198
199 mapName = mapName.Trim(); 199 mapName = mapName.Trim();
200 200
201 if (!mapName.StartsWith("http")) 201 if (!mapName.StartsWith("http") && !!mapName.StartsWith("https"))
202 { 202 {
203 // Formats: grid.example.com:8002:region name 203 // Formats: grid.example.com:8002:region name
204 // grid.example.com:region name 204 // grid.example.com:region name
@@ -365,7 +365,9 @@ namespace OpenSim.Services.GridService
365 UUID regionID = UUID.Zero; 365 UUID regionID = UUID.Zero;
366 string externalName = string.Empty; 366 string externalName = string.Empty;
367 string imageURL = string.Empty; 367 string imageURL = string.Empty;
368 if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason)) 368 int sizeX = (int)Constants.RegionSize;
369 int sizeY = (int)Constants.RegionSize;
370 if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason, out sizeX, out sizeY))
369 return false; 371 return false;
370 372
371 if (regionID == UUID.Zero) 373 if (regionID == UUID.Zero)
@@ -397,6 +399,8 @@ namespace OpenSim.Services.GridService
397// } 399// }
398 400
399 regInfo.RegionID = regionID; 401 regInfo.RegionID = regionID;
402 regInfo.RegionSizeX = sizeX;
403 regInfo.RegionSizeY = sizeY;
400 404
401 if (externalName == string.Empty) 405 if (externalName == string.Empty)
402 regInfo.RegionName = regInfo.ServerURI; 406 regInfo.RegionName = regInfo.ServerURI;