Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current

1 files changed, 37 insertions, 8 deletions

diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index f991d01..7e55d3c 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -133,6 +133,8 @@ namespace OpenSim.Groups
                         return HandleAddNotice(request);
                     case "GETNOTICES":
                         return HandleGetNotices(request);
+                    case "FINDGROUPS":
+                        return HandleFindGroups(request);
                 }
                 m_log.DebugFormat("[GROUPS HANDLER]: unknown method request: {0}", method);
             }
@@ -170,11 +172,16 @@ namespace OpenSim.Groups
 
                 }
 
-                grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
-                if (grec == null)
-                    NullResult(result, "Internal Error");
+                if (grec.GroupID != UUID.Zero)
+                {
+                    grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
+                    if (grec == null)
+                        NullResult(result, "Internal Error");
+                    else
+                        result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                }
                 else
-                    result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                    NullResult(result, reason);
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
@@ -264,7 +271,6 @@ namespace OpenSim.Groups
                 UUID groupID = new UUID(request["GroupID"].ToString());
                 string agentID = request["AgentID"].ToString();
                 string requestingAgentID = request["RequestingAgentID"].ToString();
-                string reason = string.Empty;
 
                 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
             }
@@ -495,7 +501,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 bool success = false;
                 if (op == "ADD")
@@ -563,7 +568,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 if (op == "GROUP")
                 {
@@ -626,7 +630,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
                 {   
@@ -739,6 +742,32 @@ namespace OpenSim.Groups
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] HandleFindGroups(Dictionary<string, object> request)
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("Query"))
+                NullResult(result, "Bad network data");
+
+            List<DirGroupsReplyData> hits = m_GroupsService.FindGroups(request["RequestingAgentID"].ToString(), request["Query"].ToString());
+
+            if (hits == null || (hits != null && hits.Count == 0))
+                NullResult(result, "No hits");
+            else
+            {
+                Dictionary<string, object> dict = new Dictionary<string, object>();
+                int i = 0;
+                foreach (DirGroupsReplyData n in hits)
+                    dict["n-" + i++] = GroupsDataUtils.DirGroupsReplyData(n);
+
+                result["RESULT"] = dict;
+            }
+
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
+        }
+
 
         #region Helpers