From a48b3ef97afddbdc5ed3a492bfbe80b94ca7bdcd Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 31 Jul 2014 21:20:10 +0100 Subject: [PATCH] Don't overwrite the null result with the true result is groups service REMOVEAGENTFROMGROUP call has failed because of missing parameters --- .../Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 3 ++- OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index dc36787836..207d810ecb 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs @@ -210,10 +210,11 @@ namespace OpenSim.Groups string token = request["AccessToken"].ToString(); m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); + + result["RESULT"] = "true"; } //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); - result["RESULT"] = "true"; return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); } diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 95c320869d..5cf6ec70d4 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs @@ -286,10 +286,11 @@ namespace OpenSim.Groups string requestingAgentID = request["RequestingAgentID"].ToString(); m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID); + + result["RESULT"] = "true"; } //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); - result["RESULT"] = "true"; return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result)); }