aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-31 21:32:20 +0100
committerJustin Clark-Casey2014-08-02 00:58:37 +0100
commit319bbce5176b5ba667bfc720f4cfd963ee937455 (patch)
treee074c7a672c735b6467d9cac19d91772cbcf497b /OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
parentDon't overwrite the null result with the true result is groups service REMOVE... (diff)
downloadopensim-SC_OLD-319bbce5176b5ba667bfc720f4cfd963ee937455.zip
opensim-SC_OLD-319bbce5176b5ba667bfc720f4cfd963ee937455.tar.gz
opensim-SC_OLD-319bbce5176b5ba667bfc720f4cfd963ee937455.tar.bz2
opensim-SC_OLD-319bbce5176b5ba667bfc720f4cfd963ee937455.tar.xz
If REMOVEAGENTFROMGROUP core groups call fails because requesting agent does not have sufficient permission, return null failure result rather than true.
On non-HG this is on the only recognized failure state so we can return more information in the error result. On HG there are multiple failure states which would require more work to distinguish, so currently return the unsatisfying "Internal Error" like some other existing calls.
Diffstat (limited to '')
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index 207d810..f60c1a5 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -209,9 +209,10 @@ namespace OpenSim.Groups
209 string agentID = request["AgentID"].ToString(); 209 string agentID = request["AgentID"].ToString();
210 string token = request["AccessToken"].ToString(); 210 string token = request["AccessToken"].ToString();
211 211
212 m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token); 212 if (!m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token))
213 213 NullResult(result, "Internal error");
214 result["RESULT"] = "true"; 214 else
215 result["RESULT"] = "true";
215 } 216 }
216 217
217 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 218 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);