aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-09 14:13:51 -0700
committerDiva Canto2013-07-09 14:13:51 -0700
commitd0dfb744b206d3bd002ed72f415f177c6b04226b (patch)
treedba29f24667d254371abb726e2842700c189dfdf /OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
parentPut guards on a bunch of exception-inducing code, as seen in logs from load t... (diff)
parentBulletSim: add parameter to optionally disable vehicle linear deflection. (diff)
downloadopensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs')
-rw-r--r--OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index 28f7acc..106c6c4 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Groups
75 m_GroupsService = service; 75 m_GroupsService = service;
76 } 76 }
77 77
78 public override byte[] Handle(string path, Stream requestData, 78 protected override byte[] ProcessRequest(string path, Stream requestData,
79 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 79 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
80 { 80 {
81 StreamReader sr = new StreamReader(requestData); 81 StreamReader sr = new StreamReader(requestData);
@@ -269,7 +269,6 @@ namespace OpenSim.Groups
269 UUID groupID = new UUID(request["GroupID"].ToString()); 269 UUID groupID = new UUID(request["GroupID"].ToString());
270 string agentID = request["AgentID"].ToString(); 270 string agentID = request["AgentID"].ToString();
271 string requestingAgentID = request["RequestingAgentID"].ToString(); 271 string requestingAgentID = request["RequestingAgentID"].ToString();
272 string reason = string.Empty;
273 272
274 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID); 273 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
275 } 274 }
@@ -500,7 +499,6 @@ namespace OpenSim.Groups
500 else 499 else
501 { 500 {
502 string op = request["OP"].ToString(); 501 string op = request["OP"].ToString();
503 string reason = string.Empty;
504 502
505 bool success = false; 503 bool success = false;
506 if (op == "ADD") 504 if (op == "ADD")
@@ -568,7 +566,6 @@ namespace OpenSim.Groups
568 else 566 else
569 { 567 {
570 string op = request["OP"].ToString(); 568 string op = request["OP"].ToString();
571 string reason = string.Empty;
572 569
573 if (op == "GROUP") 570 if (op == "GROUP")
574 { 571 {
@@ -631,7 +628,6 @@ namespace OpenSim.Groups
631 else 628 else
632 { 629 {
633 string op = request["OP"].ToString(); 630 string op = request["OP"].ToString();
634 string reason = string.Empty;
635 631
636 if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID")) 632 if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
637 { 633 {