From e766f9d20f80425948f5cfe9204cdf85908e77fa Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 26 Jul 2016 16:54:04 +0100 Subject: [PATCH] get a copy of current clientView group powers --- OpenSim/Framework/IClientAPI.cs | 2 ++ OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++++ .../Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 +++++ OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 5 +++++ OpenSim/Tests/Common/Mock/TestClient.cs | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index d9932eb544..2495834e81 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -733,6 +733,8 @@ namespace OpenSim.Framework ulong ActiveGroupPowers { get; } + Dictionary GetGroupPowers(); + ulong GetGroupPowers(UUID groupID); bool IsGroupMember(UUID GroupID); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 68fe8d96b2..39f43eeeae 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -5782,6 +5782,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(packet, ThrottleOutPacketType.Task); } + public Dictionary GetGroupPowers() + { + lock(m_groupPowers) + { + return new Dictionary(m_groupPowers); + } + } + public ulong GetGroupPowers(UUID groupID) { if (groupID == ActiveGroupId) diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index f34dbe8b0c..ade30a65c6 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -582,6 +582,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server get { return 0; } } + public Dictionary GetGroupPowers() + { + return new Dictionary(); + } + public ulong GetGroupPowers(UUID groupID) { return 0; diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index bdac6aa6a1..7cfa360288 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs @@ -603,6 +603,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC return (m_hostGroupID == groupID); } + public Dictionary GetGroupPowers() + { + return new Dictionary(); + } + public ulong GetGroupPowers(UUID groupID) { return 0; diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 98a98c069c..cc87a5411c 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs @@ -421,6 +421,11 @@ namespace OpenSim.Tests.Common return false; } + public Dictionary GetGroupPowers() + { + return new Dictionary(); + } + public ulong GetGroupPowers(UUID groupID) { return 0;