diff options
author | lbsa71 | 2009-03-12 10:50:59 +0000 |
---|---|---|
committer | lbsa71 | 2009-03-12 10:50:59 +0000 |
commit | 33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a (patch) | |
tree | eb1bb1db8b93b4038d8f12d4d7abee2e5071b9fe /OpenSim/Region/Communications/OGS1 | |
parent | Move ArchiveConstants to OpenSim.Framework.Archive (diff) | |
download | opensim-SC_OLD-33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a.zip opensim-SC_OLD-33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a.tar.gz opensim-SC_OLD-33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a.tar.bz2 opensim-SC_OLD-33f511ee4b5b4e1f8fe4fbb47d3b5b51e1d0104a.tar.xz |
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
416 | httpPort = Convert.ToUInt32((string)responseData["http_port"]); | 416 | httpPort = Convert.ToUInt32((string)responseData["http_port"]); |
417 | } | 417 | } |
418 | 418 | ||
419 | // Ok, so this is definitively the wrong place to do this, way too hard coded, but it doesn't seem we GET this info? | ||
420 | |||
421 | string simURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; | ||
419 | 422 | ||
420 | // string externalUri = (string) responseData["sim_uri"]; | 423 | // string externalUri = (string) responseData["sim_uri"]; |
421 | 424 | ||
422 | //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); | 425 | //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); |
423 | regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort); | 426 | regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI ); |
424 | 427 | ||
425 | lock (m_remoteRegionInfoCache) | 428 | lock (m_remoteRegionInfoCache) |
426 | { | 429 | { |