Merge branch 'master' of opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie Thielker
2016-07-04 03:37:45 +01:00
19 changed files with 245 additions and 198 deletions

View File

@@ -1281,6 +1281,18 @@ namespace OpenSim.Tests.Common
{
}
public void UpdateGroupMembership(GroupMembershipData[] data)
{
}
public void GroupMembershipRemove(UUID GroupID)
{
}
public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
{
}
public void SendUseCachedMuteList()
{
}

View File

@@ -157,11 +157,6 @@ namespace OpenSim.Tests.Common
AddEvent(avatarID, "ParcelProperties", parcelPropertiesMessage);
}
public void GroupMembership (OpenMetaverse.Packets.AgentGroupDataUpdatePacket groupUpdate, UUID avatarID)
{
AddEvent(avatarID, "GroupMembership", groupUpdate);
}
public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
{
AddEvent(receiverAgent, "AgentGroupDataUpdate", data);