diff options
author | UbitUmarov | 2016-08-04 20:57:57 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-04 20:57:57 +0100 |
commit | a66e747c95eb2b1fc090142ee5bba973a4ab1079 (patch) | |
tree | d31bfda8b5ca86617077035399922689db9c8bbc /OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | |
parent | add a weak safeguard (diff) | |
download | opensim-SC-a66e747c95eb2b1fc090142ee5bba973a4ab1079.zip opensim-SC-a66e747c95eb2b1fc090142ee5bba973a4ab1079.tar.gz opensim-SC-a66e747c95eb2b1fc090142ee5bba973a4ab1079.tar.bz2 opensim-SC-a66e747c95eb2b1fc090142ee5bba973a4ab1079.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | 17 |
1 files changed, 12 insertions, 5 deletions
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 | |||
182 | m_ClientMap.Add(client.AgentId, client); | 182 | m_ClientMap.Add(client.AgentId, client); |
183 | } | 183 | } |
184 | } | 184 | } |
185 | |||
186 | GroupMembershipData[] updateGroups = new GroupMembershipData[1]; | ||
187 | updateGroups[0] = osGroup; | ||
188 | |||
189 | client.SendGroupMembership(updateGroups); | ||
190 | } | 185 | } |
191 | 186 | ||
192 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, | 187 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, |
@@ -237,6 +232,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups | |||
237 | remote_client.SendGroupNameReply(groupUUID, groupnamereply); | 232 | remote_client.SendGroupNameReply(groupUUID, groupnamereply); |
238 | } | 233 | } |
239 | 234 | ||
235 | public GroupMembershipData[] GetMembershipData(UUID agentID) | ||
236 | { | ||
237 | GroupMembershipData[] updateGroups = new GroupMembershipData[1]; | ||
238 | updateGroups[0] = osGroup; | ||
239 | return updateGroups; | ||
240 | } | ||
241 | |||
242 | public GroupMembershipData GetActiveMembershipData(UUID agentID) | ||
243 | { | ||
244 | return osGroup; | ||
245 | } | ||
246 | |||
240 | private void OnClientClosed(UUID agentID, Scene scene) | 247 | private void OnClientClosed(UUID agentID, Scene scene) |
241 | { | 248 | { |
242 | lock (m_ClientMap) | 249 | lock (m_ClientMap) |