aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs28
1 files changed, 13 insertions, 15 deletions
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index 482862d..29cfd6e 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -109,9 +109,9 @@ namespace OpenSim.Services.Connectors
109 { 109 {
110 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 110 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
111 111
112 if (replyData.ContainsKey("Result")) 112 if (replyData.ContainsKey("result"))
113 { 113 {
114 if (replyData["Result"].ToString().ToLower() == "success") 114 if (replyData["result"].ToString().ToLower() == "success")
115 return true; 115 return true;
116 else 116 else
117 return false; 117 return false;
@@ -153,9 +153,9 @@ namespace OpenSim.Services.Connectors
153 { 153 {
154 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 154 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
155 155
156 if (replyData.ContainsKey("Result")) 156 if (replyData.ContainsKey("result"))
157 { 157 {
158 if (replyData["Result"].ToString().ToLower() == "success") 158 if (replyData["result"].ToString().ToLower() == "success")
159 return true; 159 return true;
160 else 160 else
161 return false; 161 return false;
@@ -196,9 +196,9 @@ namespace OpenSim.Services.Connectors
196 { 196 {
197 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 197 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
198 198
199 if (replyData.ContainsKey("Result")) 199 if (replyData.ContainsKey("result"))
200 { 200 {
201 if (replyData["Result"].ToString().ToLower() == "success") 201 if (replyData["result"].ToString().ToLower() == "success")
202 return true; 202 return true;
203 else 203 else
204 return false; 204 return false;
@@ -242,9 +242,9 @@ namespace OpenSim.Services.Connectors
242 { 242 {
243 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 243 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
244 244
245 if (replyData.ContainsKey("Result")) 245 if (replyData.ContainsKey("result"))
246 { 246 {
247 if (replyData["Result"].ToString().ToLower() == "success") 247 if (replyData["result"].ToString().ToLower() == "success")
248 return true; 248 return true;
249 else 249 else
250 return false; 250 return false;
@@ -296,11 +296,8 @@ namespace OpenSim.Services.Connectors
296 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 296 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
297 PresenceInfo pinfo = null; 297 PresenceInfo pinfo = null;
298 298
299 if ((replyData != null) && (replyData["result"] != null)) 299 if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
300 { 300 {
301 if (replyData["result"].ToString() == "null")
302 return null;
303
304 if (replyData["result"] is Dictionary<string, object>) 301 if (replyData["result"] is Dictionary<string, object>)
305 { 302 {
306 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]); 303 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
@@ -345,7 +342,8 @@ namespace OpenSim.Services.Connectors
345 342
346 if (replyData != null) 343 if (replyData != null)
347 { 344 {
348 if (replyData.ContainsKey("result") && replyData.ContainsKey("result").ToString() == "null") 345 if (replyData.ContainsKey("result") &&
346 (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
349 { 347 {
350 return new PresenceInfo[0]; 348 return new PresenceInfo[0];
351 } 349 }
@@ -395,9 +393,9 @@ namespace OpenSim.Services.Connectors
395 { 393 {
396 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 394 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
397 395
398 if (replyData.ContainsKey("Result")) 396 if (replyData.ContainsKey("result"))
399 { 397 {
400 if (replyData["Result"].ToString().ToLower() == "success") 398 if (replyData["result"].ToString().ToLower() == "success")
401 return true; 399 return true;
402 else 400 else
403 return false; 401 return false;