From 05467cb7803f2ccd8cacb2fc848ea378905e6bfe Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Fri, 5 Dec 2008 17:31:31 +0000
Subject: - Use the http-port that is now provided by the grid-server. If it
 isn't (because GridServer is too old), complain. Not used yet, but will be
 necessary for crossing regions correcly.

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

(limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 0c13120..59250fd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -301,6 +301,11 @@ namespace OpenSim.Region.Communications.OGS1
                         {
                             sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
                         }
+                        else
+                        {
+                            m_log.Error("[OGS1 GRID SERVICES]: Couldn't find httpPort, using default 9000; please upgrade your grid-server to r7621 or later");
+                            sri.HttpPort = 9000; // that's the default and will probably be wrong
+                        }
 
                         sri.RegionID = new UUID((string) neighbourData["uuid"]);
 
-- 
cgit v1.1