aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-01-31 22:00:59 -0800
committerDiva Canto2012-01-31 22:00:59 -0800
commit3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b (patch)
tree4272a83e3097d4a5acf4788485b0d2c6bd930e49 /OpenSim
parentLay out script status in property per row format, since getting too long for ... (diff)
downloadopensim-SC_OLD-3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b.zip
opensim-SC_OLD-3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b.tar.gz
opensim-SC_OLD-3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b.tar.bz2
opensim-SC_OLD-3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b.tar.xz
HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri.ToString() drops the port when it's port 80.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 8d41728..38a7805 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
348 348
349 region.ExternalHostName = uri.Host; 349 region.ExternalHostName = uri.Host;
350 region.HttpPort = (uint)uri.Port; 350 region.HttpPort = (uint)uri.Port;
351 region.ServerURI = uri.ToString(); 351 region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString();
352 region.RegionName = string.Empty; 352 region.RegionName = string.Empty;
353 region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); 353 region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
354 return region; 354 return region;