From 6ab463a4461d84625e32afd19bfc64e77e1badd6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Jul 2014 21:20:10 +0100
Subject: Don't overwrite the null result with the true result is groups
 service REMOVEAGENTFROMGROUP call has failed because of missing parameters

---
 OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 3 ++-
 OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
                 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 95c3208..5cf6ec7 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));
         }
 
-- 
cgit v1.1