From aa521fb385c055980c8af1ddf44d839c643fd22e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 28 Aug 2013 16:33:01 -0700
Subject: Do not add a port zero to end of the hypergrid gateway host name. If
 the port is specified it is added but a ":0" is not added if the port is
 zero. This enables the hypergrid address short form
 "hypergridGateway:regionName" which is handled by the parser but failed
 because of this zero port addition.

---
 OpenSim/Services/Interfaces/IGridService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index d7da056..6ed681f 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -137,7 +137,10 @@ namespace OpenSim.Services.Interfaces
                 if ( m_serverURI != string.Empty ) {
                     return m_serverURI;
                 } else {
-                    return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+                    if (m_httpPort == 0)
+                        return "http://" + m_externalHostName + "/";
+                    else
+                        return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                 }
             }
             set { 
-- 
cgit v1.1