diff options
author | Robert Adams | 2013-08-28 16:33:01 -0700 |
---|---|---|
committer | Robert Adams | 2013-08-28 16:38:07 -0700 |
commit | aa521fb385c055980c8af1ddf44d839c643fd22e (patch) | |
tree | 444de05b6d4080907465f4bb3c493b4c86886023 /OpenSim/Services/Interfaces/IGridService.cs | |
parent | BulletSim: add some protections for processing when shutting down. (diff) | |
download | opensim-SC_OLD-aa521fb385c055980c8af1ddf44d839c643fd22e.zip opensim-SC_OLD-aa521fb385c055980c8af1ddf44d839c643fd22e.tar.gz opensim-SC_OLD-aa521fb385c055980c8af1ddf44d839c643fd22e.tar.bz2 opensim-SC_OLD-aa521fb385c055980c8af1ddf44d839c643fd22e.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
137 | if ( m_serverURI != string.Empty ) { | 137 | if ( m_serverURI != string.Empty ) { |
138 | return m_serverURI; | 138 | return m_serverURI; |
139 | } else { | 139 | } else { |
140 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | 140 | if (m_httpPort == 0) |
141 | return "http://" + m_externalHostName + "/"; | ||
142 | else | ||
143 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
141 | } | 144 | } |
142 | } | 145 | } |
143 | set { | 146 | set { |