aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-31 21:20:10 +0100
committerJustin Clark-Casey (justincc)2014-07-31 21:20:55 +0100
commit6ab463a4461d84625e32afd19bfc64e77e1badd6 (patch)
treec32f29e83ee4296f37e73c96240fdcfc26529cf7 /OpenSim
parentAdd region-side extra feature setting for destination guide (diff)
downloadopensim-SC-6ab463a4461d84625e32afd19bfc64e77e1badd6.zip
opensim-SC-6ab463a4461d84625e32afd19bfc64e77e1badd6.tar.gz
opensim-SC-6ab463a4461d84625e32afd19bfc64e77e1badd6.tar.bz2
opensim-SC-6ab463a4461d84625e32afd19bfc64e77e1badd6.tar.xz
Don't overwrite the null result with the true result is groups service REMOVEAGENTFROMGROUP call has failed because of missing parameters
Diffstat (limited to '')
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs3
-rw-r--r--OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs3
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index dc36787..207d810 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -210,10 +210,11 @@ namespace OpenSim.Groups
210 string token = request["AccessToken"].ToString(); 210 string token = request["AccessToken"].ToString();
211 211
212 m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); 212 m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
213
214 result["RESULT"] = "true";
213 } 215 }
214 216
215 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 217 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
216 result["RESULT"] = "true";
217 return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); 218 return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
218 } 219 }
219 220
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index 95c3208..5cf6ec7 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -286,10 +286,11 @@ namespace OpenSim.Groups
286 string requestingAgentID = request["RequestingAgentID"].ToString(); 286 string requestingAgentID = request["RequestingAgentID"].ToString();
287 287
288 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID); 288 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
289
290 result["RESULT"] = "true";
289 } 291 }
290 292
291 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 293 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
292 result["RESULT"] = "true";
293 return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); 294 return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
294 } 295 }
295 296