aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-07-26 17:57:14 +0100
committerUbitUmarov2016-07-26 17:57:14 +0100
commit1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67 (patch)
treeca97e43d56625d9c9947a510d587fec523280b53 /OpenSim
parent let some group related data to have a public set (diff)
downloadopensim-SC_OLD-1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67.zip
opensim-SC_OLD-1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67.tar.gz
opensim-SC_OLD-1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67.tar.bz2
opensim-SC_OLD-1a8a8e16efae4bdfc5cbd5108171737ceaaa4c67.tar.xz
add a public SetGroupPowers to clientView
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs9
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
5 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 0672014..9bf51f8 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -735,6 +735,8 @@ namespace OpenSim.Framework
735 735
736 Dictionary<UUID, ulong> GetGroupPowers(); 736 Dictionary<UUID, ulong> GetGroupPowers();
737 737
738 void SetGroupPowers(Dictionary<UUID, ulong> powers);
739
738 ulong GetGroupPowers(UUID groupID); 740 ulong GetGroupPowers(UUID groupID);
739 741
740 bool IsGroupMember(UUID GroupID); 742 bool IsGroupMember(UUID GroupID);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 2026f78..0bb5dc6 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
5790 } 5790 }
5791 } 5791 }
5792 5792
5793 public void SetGroupPowers(Dictionary<UUID, ulong> powers)
5794 {
5795 lock(m_groupPowers)
5796 {
5797 m_groupPowers.Clear();
5798 m_groupPowers = powers;
5799 }
5800 }
5801
5793 public ulong GetGroupPowers(UUID groupID) 5802 public ulong GetGroupPowers(UUID groupID)
5794 { 5803 {
5795 if (groupID == ActiveGroupId) 5804 if (groupID == ActiveGroupId)
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 7c08d08..50be3ac 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
589 { 589 {
590 return new Dictionary<UUID, ulong>(); 590 return new Dictionary<UUID, ulong>();
591 } 591 }
592 592
593 public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
594
593 public ulong GetGroupPowers(UUID groupID) 595 public ulong GetGroupPowers(UUID groupID)
594 { 596 {
595 return 0; 597 return 0;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index a84520fe..4275192 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
610 return new Dictionary<UUID, ulong>(); 610 return new Dictionary<UUID, ulong>();
611 } 611 }
612 612
613 public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
614
613 public ulong GetGroupPowers(UUID groupID) 615 public ulong GetGroupPowers(UUID groupID)
614 { 616 {
615 return 0; 617 return 0;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 83328c8..4f8e986 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -429,6 +429,8 @@ namespace OpenSim.Tests.Common
429 return new Dictionary<UUID, ulong>(); 429 return new Dictionary<UUID, ulong>();
430 } 430 }
431 431
432 public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
433
432 public ulong GetGroupPowers(UUID groupID) 434 public ulong GetGroupPowers(UUID groupID)
433 { 435 {
434 return 0; 436 return 0;