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

add a few methods to modify clientview group powers

LSLKeyTest
UbitUmarov 2016-07-01 18:19:09 +01:00
parent 1777324a86
commit aa744eecf2
5 changed files with 108 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@ -1473,6 +1473,9 @@ namespace OpenSim.Framework
void SendAgentDropGroup(UUID groupID); void SendAgentDropGroup(UUID groupID);
void RefreshGroupMembership(); void RefreshGroupMembership();
void UpdateGroupMembership(GroupMembershipData[] data);
void GroupMembershipRemove(UUID GroupID);
void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers);
void SendAvatarNotesReply(UUID targetID, string text); void SendAvatarNotesReply(UUID targetID, string text);
void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks);
void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled); void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled);

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

@ -2755,29 +2755,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendGroupMembership(GroupMembershipData[] GroupMembership) public void SendGroupMembership(GroupMembershipData[] GroupMembership)
{ {
m_groupPowers.Clear();
// maybe removed in future, use SendAgentGroupDataUpdate instead ( but make sure to update groupPowers )
AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket(); AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket();
AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[GroupMembership.Length]; AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[GroupMembership.Length];
for (int i = 0; i < GroupMembership.Length; i++)
lock(m_groupPowers)
{ {
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers; m_groupPowers.Clear();
AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
Group.AcceptNotices = GroupMembership[i].AcceptNotices;
Group.Contribution = GroupMembership[i].Contribution;
Group.GroupID = GroupMembership[i].GroupID;
Group.GroupInsigniaID = GroupMembership[i].GroupPicture;
Group.GroupName = Util.StringToBytes256(GroupMembership[i].GroupName);
Group.GroupPowers = GroupMembership[i].GroupPowers;
Groups[i] = Group;
for (int i = 0; i < GroupMembership.Length; i++)
{
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
Group.AcceptNotices = GroupMembership[i].AcceptNotices;
Group.Contribution = GroupMembership[i].Contribution;
Group.GroupID = GroupMembership[i].GroupID;
Group.GroupInsigniaID = GroupMembership[i].GroupPicture;
Group.GroupName = Util.StringToBytes256(GroupMembership[i].GroupName);
Group.GroupPowers = GroupMembership[i].GroupPowers;
Groups[i] = Group;
}
} }
Groupupdate.GroupData = Groups; Groupupdate.GroupData = Groups;
Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock(); Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock();
Groupupdate.AgentData.AgentID = AgentId; Groupupdate.AgentData.AgentID = AgentId;
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
try try
{ {
@ -5639,9 +5644,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (groupID == ActiveGroupId) if (groupID == ActiveGroupId)
return ActiveGroupPowers; return ActiveGroupPowers;
if (m_groupPowers.ContainsKey(groupID)) lock(m_groupPowers)
return m_groupPowers[groupID]; {
if (m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID];
}
return 0; return 0;
} }
@ -12952,23 +12959,57 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void RefreshGroupMembership() public void RefreshGroupMembership()
{ {
if (m_GroupsModule != null) lock(m_groupPowers)
{ {
GroupMembershipData[] GroupMembership = if (m_GroupsModule != null)
{
GroupMembershipData[] GroupMembership =
m_GroupsModule.GetMembershipData(AgentId); m_GroupsModule.GetMembershipData(AgentId);
m_groupPowers.Clear(); m_groupPowers.Clear();
if (GroupMembership != null) if (GroupMembership != null)
{
for (int i = 0; i < GroupMembership.Length; i++)
{ {
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers; for (int i = 0; i < GroupMembership.Length; i++)
{
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
}
} }
} }
} }
} }
public void UpdateGroupMembership(GroupMembershipData[] data)
{
lock(m_groupPowers)
{
m_groupPowers.Clear();
if (data != null)
{
for (int i = 0; i < data.Length; i++)
m_groupPowers[data[i].GroupID] = data[i].GroupPowers;
}
}
}
public void GroupMembershipRemove(UUID GroupID)
{
lock(m_groupPowers)
{
if(m_groupPowers.ContainsKey(GroupID))
m_groupPowers.Remove(GroupID);
}
}
public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
{
lock(m_groupPowers)
{
m_groupPowers[GroupID] = GroupPowers;
}
}
public string Report() public string Report()
{ {
return m_udpClient.GetStats(); return m_udpClient.GetStats();

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

@ -1626,6 +1626,22 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
} }
public void UpdateGroupMembership(GroupMembershipData[] data)
{
}
public void GroupMembershipRemove(UUID GroupID)
{
}
public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
{
}
public void SendAvatarNotesReply(UUID targetID, string text) public void SendAvatarNotesReply(UUID targetID, string text)
{ {

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

@ -1255,6 +1255,18 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public void UpdateGroupMembership(GroupMembershipData[] data)
{
}
public void GroupMembershipRemove(UUID GroupID)
{
}
public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
{
}
public void SendUseCachedMuteList() public void SendUseCachedMuteList()
{ {
} }

12
OpenSim/Tests/Common/Mock/TestClient.cs
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() public void SendUseCachedMuteList()
{ {
} }