From 1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 26 Jul 2016 17:57:14 +0100 Subject: [PATCH] add a public SetGroupPowers to clientView --- OpenSim/Framework/IClientAPI.cs | 2 ++ OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 9 +++++++++ .../InternetRelayClientView/Server/IRCClientView.cs | 4 +++- OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 ++ OpenSim/Tests/Common/Mock/TestClient.cs | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 0672014c0b..9bf51f889c 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -735,6 +735,8 @@ namespace OpenSim.Framework Dictionary GetGroupPowers(); + void SetGroupPowers(Dictionary powers); + 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 2026f78d68..0bb5dc68ea 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -5790,6 +5790,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } + public void SetGroupPowers(Dictionary powers) + { + lock(m_groupPowers) + { + m_groupPowers.Clear(); + m_groupPowers = powers; + } + } + 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 7c08d0836c..50be3aced7 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -589,7 +589,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { return new Dictionary(); } - + + public void SetGroupPowers(Dictionary powers) { } + 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 a84520fe9b..4275192a33 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs @@ -610,6 +610,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC return new Dictionary(); } + public void SetGroupPowers(Dictionary powers) { } + public ulong GetGroupPowers(UUID groupID) { return 0; diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 83328c8c29..4f8e986771 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs @@ -429,6 +429,8 @@ namespace OpenSim.Tests.Common return new Dictionary(); } + public void SetGroupPowers(Dictionary powers) { } + public ulong GetGroupPowers(UUID groupID) { return 0;