diff options
author | UbitUmarov | 2016-12-10 01:00:48 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-10 01:00:48 +0000 |
commit | a3e2a42f0d7b1e146892de3d5ddb7b5a96df0d4d (patch) | |
tree | ade8db84feadbde85a43cdfcacd3c6143ad801b6 /OpenSim/Services/GridService | |
parent | avoid a null ref (diff) | |
download | opensim-SC_OLD-a3e2a42f0d7b1e146892de3d5ddb7b5a96df0d4d.zip opensim-SC_OLD-a3e2a42f0d7b1e146892de3d5ddb7b5a96df0d4d.tar.gz opensim-SC_OLD-a3e2a42f0d7b1e146892de3d5ddb7b5a96df0d4d.tar.bz2 opensim-SC_OLD-a3e2a42f0d7b1e146892de3d5ddb7b5a96df0d4d.tar.xz |
HG regions URI need to include also the default ports for compatibility
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index e00025b..ceb2c6e 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -255,11 +255,8 @@ namespace OpenSim.Services.GridService | |||
255 | regionName = parts[2]; | 255 | regionName = parts[2]; |
256 | } | 256 | } |
257 | 257 | ||
258 | if(port == 80) | 258 | serverURI = "http://"+ host +":"+ port.ToString() + "/"; |
259 | serverURI = "http://"+ host + "/"; | 259 | } |
260 | else | ||
261 | serverURI = "http://"+ host +":"+ port.ToString() + "/"; | ||
262 | } | ||
263 | } | 260 | } |
264 | else | 261 | else |
265 | { | 262 | { |
@@ -301,6 +298,10 @@ namespace OpenSim.Services.GridService | |||
301 | if(!string.IsNullOrEmpty(regionName)) | 298 | if(!string.IsNullOrEmpty(regionName)) |
302 | regionName = regionName.Trim(new char[] { '"', ' ' }); | 299 | regionName = regionName.Trim(new char[] { '"', ' ' }); |
303 | serverURI = uri.AbsoluteUri; | 300 | serverURI = uri.AbsoluteUri; |
301 | if(uri.Port == 80) | ||
302 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/"; | ||
303 | else if(uri.Port == 443) | ||
304 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/"; | ||
304 | return true; | 305 | return true; |
305 | } | 306 | } |
306 | 307 | ||