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

add missing SendAgentGroupDataUpdate to llClientView

avinationmerge
UbitUmarov 2015-09-27 06:36:26 +01:00
parent 1e23b3482c
commit 18536b4be6
5 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/IClientAPI.cs
View File

@ -1457,6 +1457,7 @@ namespace OpenSim.Framework
void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags); void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags);
void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data); void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data);
void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data);
void SendOfferCallingCard(UUID srcID, UUID transactionID); void SendOfferCallingCard(UUID srcID, UUID transactionID);
void SendAcceptCallingCard(UUID transactionID); void SendAcceptCallingCard(UUID transactionID);
void SendDeclineCallingCard(UUID transactionID); void SendDeclineCallingCard(UUID transactionID);

35
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3404,6 +3404,41 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
{
OSDMap llsd = new OSDMap(3);
OSDArray AgentData = new OSDArray(1);
OSDMap AgentDataMap = new OSDMap(1);
AgentDataMap.Add("AgentID", OSD.FromUUID(this.AgentId));
AgentDataMap.Add("AvatarID", OSD.FromUUID(avatarID));
AgentData.Add(AgentDataMap);
llsd.Add("AgentData", AgentData);
OSDArray GroupData = new OSDArray(data.Length);
OSDArray NewGroupData = new OSDArray(data.Length);
foreach (GroupMembershipData m in data)
{
OSDMap GroupDataMap = new OSDMap(6);
OSDMap NewGroupDataMap = new OSDMap(1);
GroupDataMap.Add("GroupPowers", OSD.FromULong(m.GroupPowers));
GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices));
GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle));
GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID));
GroupDataMap.Add("GroupName", OSD.FromString(m.GroupName));
GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(m.GroupPicture));
NewGroupDataMap.Add("ListInProfile", OSD.FromBoolean(m.ListInProfile));
GroupData.Add(GroupDataMap);
NewGroupData.Add(NewGroupDataMap);
}
llsd.Add("GroupData", GroupData);
llsd.Add("NewGroupData", NewGroupData);
IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
if (eq != null)
{
eq.Enqueue(BuildEvent("AgentGroupDataUpdate", llsd), this.AgentId);
}
}
public void SendJoinGroupReply(UUID groupID, bool success) public void SendJoinGroupReply(UUID groupID, bool success)
{ {
JoinGroupReplyPacket p = (JoinGroupReplyPacket)PacketPool.Instance.GetPacket(PacketType.JoinGroupReply); JoinGroupReplyPacket p = (JoinGroupReplyPacket)PacketPool.Instance.GetPacket(PacketType.JoinGroupReply);

5
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1576,6 +1576,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
} }
public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
{
}
public void SendOfferCallingCard(UUID srcID, UUID transactionID) public void SendOfferCallingCard(UUID srcID, UUID transactionID)
{ {

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1183,6 +1183,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
{
}
public void SendTerminateFriend(UUID exFriendID) public void SendTerminateFriend(UUID exFriendID)
{ {
} }

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1208,6 +1208,10 @@ namespace OpenSim.Tests.Common
{ {
} }
public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
{
}
public void SendJoinGroupReply(UUID groupID, bool success) public void SendJoinGroupReply(UUID groupID, bool success)
{ {
} }