diff options
author | Diva Canto | 2009-09-28 20:58:21 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-28 20:58:21 -0700 |
commit | 6653a30487d76760451467a22849aba725f1e7cf (patch) | |
tree | 0881b0b7996c2b2d18c4678ede5f4f393c95ccb2 /OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |
parent | Fixed bug in Check4096 (HG). (diff) | |
download | opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.zip opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.gz opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.bz2 opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.xz |
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
Also fiddled a bit more with the initial CAP in the user server.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index dd19b01..3d7f112 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |||
@@ -69,7 +69,17 @@ namespace OpenSim.Services.Connectors.Grid | |||
69 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); | 69 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); |
70 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | 70 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; |
71 | m_log.Debug("[HGrid]: Linking to " + uri); | 71 | m_log.Debug("[HGrid]: Linking to " + uri); |
72 | XmlRpcResponse response = request.Send(uri, 10000); | 72 | XmlRpcResponse response = null; |
73 | try | ||
74 | { | ||
75 | response = request.Send(uri, 10000); | ||
76 | } | ||
77 | catch (Exception e) | ||
78 | { | ||
79 | m_log.Debug("[HGrid]: Exception " + e.Message); | ||
80 | return uuid; | ||
81 | } | ||
82 | |||
73 | if (response.IsFault) | 83 | if (response.IsFault) |
74 | { | 84 | { |
75 | m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); | 85 | m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); |