From be3360db67afd1778a74a428323cc76028b21eed Mon Sep 17 00:00:00 2001
From: justincc <jjustincc@googlemail.com>
Date: Mon, 14 Dec 2009 16:29:25 +0000
Subject: [PATCH] replace a couple of xmlrpc invocations with invoke() instead
 of send() this is in order to force an exception on an error - send() does
 not do this and people end up simply ignoring the error codes...

---
 .../MessagingServer.Modules/InterMessageUserServerModule.cs  | 5 +++--
 OpenSim/Grid/MessagingServer.Modules/MessageService.cs       | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
index 662dad3edb..d667af3ece 100644
--- a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
@@ -113,8 +113,9 @@ namespace OpenSim.Grid.MessagingServer.Modules
                 // Send Request
                 try
                 {
-                    XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
-                    XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
+                    XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
+                    XmlRpcResponse UserResp = (XmlRpcResponse)UserReq.Invoke(srv);
+                    //XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
 
                     // Process Response
                     Hashtable GridRespData = (Hashtable)UserResp.Value;
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 3ab93a37d5..ec7791b644 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -270,7 +270,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
                 IList parameters = new ArrayList();
                 parameters.Add(param);
                 XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
-                XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
+                XmlRpcResponse resp = (XmlRpcResponse)req.Invoke(m_cfg.UserServerURL);
+                //XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
                 Hashtable respData = (Hashtable)resp.Value;
 
                 if (respData.Contains("avcount"))