From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../Region/CoreModules/Avatar/Groups/GroupsModule.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs') diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs index b735c61..7f91a61 100644 --- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs @@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups return; // m_log.Debug("[GROUPS]: Shutting down group module."); - + lock (m_ClientMap) { m_ClientMap.Clear(); @@ -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