From a61b5d5d388708a3be2b5dc9466c06aac57ec610 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 10 Jun 2020 12:36:10 +0100 Subject: [PATCH] revert some changes to groups V2 that will break external modules, with no special gain --- OpenSim/Addons/Groups/GroupsModule.cs | 2 +- .../Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 4 ++-- OpenSim/Addons/Groups/IGroupsServicesConnector.cs | 2 +- .../Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs | 4 ++-- OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs | 4 ++-- .../Groups/Remote/GroupsServiceRemoteConnectorModule.cs | 4 ++-- OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | 2 +- OpenSim/Addons/Groups/Service/GroupsService.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index b0bebd96f8..9e552d2a83 100755 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs @@ -1334,7 +1334,7 @@ namespace OpenSim.Groups public List FindGroups(IClientAPI remoteClient, string query) { - return m_groupData.FindGroups(GetRequestingAgentID(remoteClient), query); + return m_groupData.FindGroups(remoteClient.AgentId.ToString(), query); } #endregion diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index cf0dfe9f91..c136cb834c 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs @@ -246,9 +246,9 @@ namespace OpenSim.Groups return null; } - public List FindGroups(UUID RequestingAgentID, string search) + public List FindGroups(string RequestingAgentIDstr, string search) { - return m_LocalGroupsConnector.FindGroups(RequestingAgentID, search); + return m_LocalGroupsConnector.FindGroups(RequestingAgentIDstr, search); } public List GetGroupMembers(string RequestingAgentID, UUID GroupID) diff --git a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs index 5583bdf882..7069166c51 100644 --- a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs +++ b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs @@ -39,7 +39,7 @@ namespace OpenSim.Groups bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish, out string reason); ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName); - List FindGroups(UUID RequestingAgentID, string search); + List FindGroups(string RequestingAgentIDstr, string search); List GetGroupMembers(string RequestingAgentID, UUID GroupID); bool AddGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, out string reason); diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs index 30f25f2525..826b245232 100644 --- a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs +++ b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs @@ -173,9 +173,9 @@ namespace OpenSim.Groups return null; } - public List FindGroups(UUID RequestingAgentID, string search) + public List FindGroups(string RequestingAgentIDstr, string search) { - return m_GroupsService.FindGroups(RequestingAgentID, search); + return m_GroupsService.FindGroups(RequestingAgentIDstr, search); } public List GetGroupMembers(string RequestingAgentID, UUID GroupID) diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs index 6d16293621..45ad8f7701 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs @@ -153,7 +153,7 @@ namespace OpenSim.Groups return GroupsDataUtils.GroupRecord((Dictionary)ret["RESULT"]); } - public List FindGroups(UUID RequestingAgentID, string query) + public List FindGroups(string RequestingAgentIDstr, string query) { List hits = new List(); if (string.IsNullOrEmpty(query)) @@ -161,7 +161,7 @@ namespace OpenSim.Groups Dictionary sendData = new Dictionary(); sendData["Query"] = query; - sendData["RequestingAgentID"] = RequestingAgentID.ToString(); + sendData["RequestingAgentID"] = RequestingAgentIDstr; Dictionary ret = MakeRequest("FINDGROUPS", sendData); diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs index d4fab797b7..eb3277cbee 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs @@ -192,10 +192,10 @@ namespace OpenSim.Groups }); } - public List FindGroups(UUID RequestingAgentID, string search) + public List FindGroups(string RequestingAgentIDstr, string search) { // TODO! - return m_GroupsService.FindGroups(RequestingAgentID, search); + return m_GroupsService.FindGroups(RequestingAgentIDstr, search); } public bool AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason) diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 500407e332..8502bb5bda 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs @@ -769,7 +769,7 @@ namespace OpenSim.Groups if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("Query")) NullResult(result, "Bad network data"); - List hits = m_GroupsService.FindGroups(new UUID(request["RequestingAgentID"].ToString()), request["Query"].ToString()); + List hits = m_GroupsService.FindGroups(request["RequestingAgentID"].ToString(), request["Query"].ToString()); if (hits == null || (hits != null && hits.Count == 0)) NullResult(result, "No hits"); diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 2c5073f50e..b5f8ff5494 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs @@ -216,7 +216,7 @@ namespace OpenSim.Groups return _GroupDataToRecord(data); } - public List FindGroups(UUID RequestingAgentID, string search) + public List FindGroups(string RequestingAgentID, string search) { List groups = new List();