OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

melanie
UbitUmarov 2016-11-27 15:07:14 +00:00
parent 155f8dac1d
commit d3cd323f0c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -232,8 +232,9 @@ namespace OpenSim.Services.GridService
regionName = parts[2]; regionName = parts[2];
} }
bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason); string serverURI = "http://"+ host +":"+ port.ToString() + "/";
if (success) // bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason);
if(TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, serverURI, ownerID, out regInfo, out reason))
{ {
regInfo.RegionName = mapName; regInfo.RegionName = mapName;
return regInfo; return regInfo;
@ -257,6 +258,8 @@ namespace OpenSim.Services.GridService
} }
serverURI = parts[0]; serverURI = parts[0];
if (!serverURI.EndsWith("/"))
serverURI = serverURI + "/";
if (parts.Length >= 2) if (parts.Length >= 2)
{ {