aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-11-27 15:07:14 +0000
committerUbitUmarov2016-11-27 15:07:14 +0000
commitd3cd323f0c5826c3162965a536645abaa5b30f04 (patch)
tree80765020022517bd9a758e014b65cef3755f5962
parentBUG fix encoding or region size on HG LinkRegionRequest response (diff)
downloadopensim-SC-d3cd323f0c5826c3162965a536645abaa5b30f04.zip
opensim-SC-d3cd323f0c5826c3162965a536645abaa5b30f04.tar.gz
opensim-SC-d3cd323f0c5826c3162965a536645abaa5b30f04.tar.bz2
opensim-SC-d3cd323f0c5826c3162965a536645abaa5b30f04.tar.xz
HG on links request build the URI in http format with a / at end, this should not be needed but is coerent with current serverURI
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 3b85160..2869349 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -231,9 +231,10 @@ namespace OpenSim.Services.GridService
231 { 231 {
232 regionName = parts[2]; 232 regionName = parts[2];
233 } 233 }
234 234
235 bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason); 235 string serverURI = "http://"+ host +":"+ port.ToString() + "/";
236 if (success) 236// bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason);
237 if(TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, serverURI, ownerID, out regInfo, out reason))
237 { 238 {
238 regInfo.RegionName = mapName; 239 regInfo.RegionName = mapName;
239 return regInfo; 240 return regInfo;
@@ -257,6 +258,8 @@ namespace OpenSim.Services.GridService
257 } 258 }
258 259
259 serverURI = parts[0]; 260 serverURI = parts[0];
261 if (!serverURI.EndsWith("/"))
262 serverURI = serverURI + "/";
260 263
261 if (parts.Length >= 2) 264 if (parts.Length >= 2)
262 { 265 {