diff options
| author | Diva Canto | 2010-09-03 10:01:18 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-09-03 10:01:18 -0700 |
| commit | 5bbf793f9e7c1607d1ebb01e886375c1a74adafb (patch) | |
| tree | b747aff1fa617bfa432ddc139b735593f00e3a2a /OpenSim/Services/Connectors | |
| parent | Another tweak. Sux^2 (diff) | |
| download | opensim-SC_OLD-5bbf793f9e7c1607d1ebb01e886375c1a74adafb.zip opensim-SC_OLD-5bbf793f9e7c1607d1ebb01e886375c1a74adafb.tar.gz opensim-SC_OLD-5bbf793f9e7c1607d1ebb01e886375c1a74adafb.tar.bz2 opensim-SC_OLD-5bbf793f9e7c1607d1ebb01e886375c1a74adafb.tar.xz | |
One last tweak, hopefully.
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 7431f04..f5b5982 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
| @@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 86 | paramList.Add(hash); | 86 | paramList.Add(hash); |
| 87 | 87 | ||
| 88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); | 88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); |
| 89 | string uri = "http://" + ((info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" ); | 89 | string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" ); |
| 90 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri); | 90 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri); |
| 91 | XmlRpcResponse response = null; | 91 | XmlRpcResponse response = null; |
| 92 | try | 92 | try |
| @@ -188,7 +188,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 188 | paramList.Add(hash); | 188 | paramList.Add(hash); |
| 189 | 189 | ||
| 190 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); | 190 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); |
| 191 | string uri = "http://" + ((gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/" ); | 191 | string uri = "http://" + ((gatekeeper.ServerURI != null && gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/"); |
| 192 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri); | 192 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri); |
| 193 | XmlRpcResponse response = null; | 193 | XmlRpcResponse response = null; |
| 194 | try | 194 | try |