OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into uglysky

master
UbitUmarov 2020-06-10 12:37:40 +01:00
parent 8d2b502393 a61b5d5d38
commit fa0a87f1c0
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Addons/Groups/GroupsModule.cs
View File

@ -1334,7 +1334,7 @@ namespace OpenSim.Groups
public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query) public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query)
{ {
return m_groupData.FindGroups(GetRequestingAgentID(remoteClient), query); return m_groupData.FindGroups(remoteClient.AgentId.ToString(), query);
} }
#endregion #endregion

4
OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
View File

@ -246,9 +246,9 @@ namespace OpenSim.Groups
return null; return null;
} }
public List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search) public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
{ {
return m_LocalGroupsConnector.FindGroups(RequestingAgentID, search); return m_LocalGroupsConnector.FindGroups(RequestingAgentIDstr, search);
} }
public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID) public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)

2
OpenSim/Addons/Groups/IGroupsServicesConnector.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Groups
bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee,
bool openEnrollment, bool allowPublish, bool maturePublish, out string reason); bool openEnrollment, bool allowPublish, bool maturePublish, out string reason);
ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName); ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName);
List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search); List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search);
List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID); List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID);
bool AddGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, out string reason); bool AddGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, out string reason);

4
OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
View File

@ -173,9 +173,9 @@ namespace OpenSim.Groups
return null; return null;
} }
public List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search) public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
{ {
return m_GroupsService.FindGroups(RequestingAgentID, search); return m_GroupsService.FindGroups(RequestingAgentIDstr, search);
} }
public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID) public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)

4
OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.Groups
return GroupsDataUtils.GroupRecord((Dictionary<string, object>)ret["RESULT"]); return GroupsDataUtils.GroupRecord((Dictionary<string, object>)ret["RESULT"]);
} }
public List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string query) public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string query)
{ {
List<DirGroupsReplyData> hits = new List<DirGroupsReplyData>(); List<DirGroupsReplyData> hits = new List<DirGroupsReplyData>();
if (string.IsNullOrEmpty(query)) if (string.IsNullOrEmpty(query))
@ -161,7 +161,7 @@ namespace OpenSim.Groups
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["Query"] = query; sendData["Query"] = query;
sendData["RequestingAgentID"] = RequestingAgentID.ToString(); sendData["RequestingAgentID"] = RequestingAgentIDstr;
Dictionary<string, object> ret = MakeRequest("FINDGROUPS", sendData); Dictionary<string, object> ret = MakeRequest("FINDGROUPS", sendData);

4
OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
View File

@ -192,10 +192,10 @@ namespace OpenSim.Groups
}); });
} }
public List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search) public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
{ {
// TODO! // 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) public bool AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason)

2
OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
View File

@ -769,7 +769,7 @@ namespace OpenSim.Groups
if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("Query")) if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("Query"))
NullResult(result, "Bad network data"); NullResult(result, "Bad network data");
List<DirGroupsReplyData> hits = m_GroupsService.FindGroups(new UUID(request["RequestingAgentID"].ToString()), request["Query"].ToString()); List<DirGroupsReplyData> hits = m_GroupsService.FindGroups(request["RequestingAgentID"].ToString(), request["Query"].ToString());
if (hits == null || (hits != null && hits.Count == 0)) if (hits == null || (hits != null && hits.Count == 0))
NullResult(result, "No hits"); NullResult(result, "No hits");

2
OpenSim/Addons/Groups/Service/GroupsService.cs
View File

@ -216,7 +216,7 @@ namespace OpenSim.Groups
return _GroupDataToRecord(data); return _GroupDataToRecord(data);
} }
public List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search) public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
{ {
List<DirGroupsReplyData> groups = new List<DirGroupsReplyData>(); List<DirGroupsReplyData> groups = new List<DirGroupsReplyData>();