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

HG regions URI need to include also the default ports for compatibility

melanie
UbitUmarov 2016-12-10 01:00:48 +00:00
parent 66990394c9
commit a3e2a42f0d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,11 +255,8 @@ namespace OpenSim.Services.GridService
regionName = parts[2]; regionName = parts[2];
} }
if(port == 80) serverURI = "http://"+ host +":"+ port.ToString() + "/";
serverURI = "http://"+ host + "/"; }
else
serverURI = "http://"+ host +":"+ port.ToString() + "/";
}
} }
else else
{ {
@ -301,6 +298,10 @@ namespace OpenSim.Services.GridService
if(!string.IsNullOrEmpty(regionName)) if(!string.IsNullOrEmpty(regionName))
regionName = regionName.Trim(new char[] { '"', ' ' }); regionName = regionName.Trim(new char[] { '"', ' ' });
serverURI = uri.AbsoluteUri; serverURI = uri.AbsoluteUri;
if(uri.Port == 80)
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/";
else if(uri.Port == 443)
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/";
return true; return true;
} }