aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2008-12-24 00:03:33 +0000
committerdiva2008-12-24 00:03:33 +0000
commit857535550cdfc07c8ef985f71342f26d39723499 (patch)
tree6b9b726971771367b154a400f30bf579b49f0d8f
parentPlumb in EventNotification* and EventGodDelete (diff)
downloadopensim-SC_OLD-857535550cdfc07c8ef985f71342f26d39723499.zip
opensim-SC_OLD-857535550cdfc07c8ef985f71342f26d39723499.tar.gz
opensim-SC_OLD-857535550cdfc07c8ef985f71342f26d39723499.tar.bz2
opensim-SC_OLD-857535550cdfc07c8ef985f71342f26d39723499.tar.xz
Better error handling for expect_hg_user on the HG.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs11
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs3
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 56a8912..fa29460 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -620,7 +620,16 @@ namespace OpenSim.Region.Communications.Hypergrid
620 string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/"; 620 string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/";
621 //Console.WriteLine("XXX uri: " + uri); 621 //Console.WriteLine("XXX uri: " + uri);
622 XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams); 622 XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams);
623 XmlRpcResponse reply = request.Send(uri, 6000); 623 XmlRpcResponse reply;
624 try
625 {
626 reply = request.Send(uri, 6000);
627 }
628 catch (Exception e)
629 {
630 m_log.Warn("[HGrid]: Failed to notify region about user. Reason: " + e.Message);
631 return false;
632 }
624 633
625 if (!reply.IsFault) 634 if (!reply.IsFault)
626 { 635 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index f45c484..58ec27e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -237,7 +237,8 @@ namespace OpenSim.Region.Communications.Hypergrid
237 Console.WriteLine("XXX Going local-grid region XXX"); 237 Console.WriteLine("XXX Going local-grid region XXX");
238 RegionInfo regInfo = RequestNeighbourInfo(regionHandle); 238 RegionInfo regInfo = RequestNeighbourInfo(regionHandle);
239 if (regInfo != null) 239 if (regInfo != null)
240 InformRegionOfUser(regInfo, agentData); 240 if (!InformRegionOfUser(regInfo, agentData))
241 return false;
241 return m_remoteBackend.InformRegionOfChildAgent(regionHandle, agentData); 242 return m_remoteBackend.InformRegionOfChildAgent(regionHandle, agentData);
242 } 243 }
243 244