From 33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 12 Mar 2009 10:50:59 +0000
Subject: * Another stab at refactoring up the CustomiseResponse function. Two
 fixes:   * Sometimes, null is a valid return value to indicate 'none found'.
 doh.   * Sometimes, the Grid server does not send simURI - this you need to
 reconstruct yourself. Euw.

(I believe) this solves mantis issue #3287

---
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Communications/OGS1')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 1a72f31..6191f27 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -416,11 +416,14 @@ namespace OpenSim.Region.Communications.OGS1
                         httpPort = Convert.ToUInt32((string)responseData["http_port"]);
                     }
 
+                    // Ok, so this is definitively the wrong place to do this, way too hard coded, but it doesn't seem we GET this info?
+
+                    string simURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port;
 
                     // string externalUri = (string) responseData["sim_uri"];
 
                     //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
-                    regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort);
+                    regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI );
 
                     lock (m_remoteRegionInfoCache)
                     {
-- 
cgit v1.1