From 3d7b5e5e93b4d9f8c2ad3be8241ee0a484fe222b Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 31 Jan 2012 22:00:59 -0800
Subject: [PATCH] HG: This hopefully fixes the HG teleports back home to
 OSGrid. Looks like Uri.ToString() drops the port when it's port 80.

---
 .../Framework/EntityTransfer/HGEntityTransferModule.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 8d41728880..38a7805b3d 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
 
             region.ExternalHostName = uri.Host;
             region.HttpPort = (uint)uri.Port;
-            region.ServerURI = uri.ToString();
+            region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString();
             region.RegionName = string.Empty;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
             return region;