From a66e747c95eb2b1fc090142ee5bba973a4ab1079 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 4 Aug 2016 20:57:57 +0100 Subject: add GetActiveMembershipData() to groups modules, let core groups also have GetMembershipData(), wait for client to ask for it not telling in OnNewClient, as other modules do. --- .../Region/CoreModules/Avatar/Groups/GroupsModule.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar/Groups') diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs index b735c61..543410e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs @@ -182,11 +182,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups m_ClientMap.Add(client.AgentId, client); } } - - GroupMembershipData[] updateGroups = new GroupMembershipData[1]; - updateGroups[0] = osGroup; - - client.SendGroupMembership(updateGroups); } private void OnAgentDataUpdateRequest(IClientAPI remoteClient, @@ -237,6 +232,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups remote_client.SendGroupNameReply(groupUUID, groupnamereply); } + public GroupMembershipData[] GetMembershipData(UUID agentID) + { + GroupMembershipData[] updateGroups = new GroupMembershipData[1]; + updateGroups[0] = osGroup; + return updateGroups; + } + + public GroupMembershipData GetActiveMembershipData(UUID agentID) + { + return osGroup; + } + private void OnClientClosed(UUID agentID, Scene scene) { lock (m_ClientMap) -- cgit v1.1