From 06e0e513cf194d97d576c111e5c481cc769bba1f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Fri, 25 Jul 2008 03:45:17 +0000 Subject: [PATCH] Add GetGroupPowers() and a dictionary to hold them to ClientView and IClientAPI. No user functionality --- OpenSim/Framework/IClientAPI.cs | 2 ++ OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 ++++++++ OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 5 +++++ OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a97ce5e535..742b211dcb 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -317,6 +317,8 @@ namespace OpenSim.Framework string ActiveGroupName { get; } ulong ActiveGroupPowers { get; } + + ulong GetGroupPowers(LLUUID groupID); string FirstName { get; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a7dd35ab9e..0c420b4d27 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -115,6 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected LLUUID m_activeGroupID = LLUUID.Zero; protected string m_activeGroupName = String.Empty; protected ulong m_activeGroupPowers = 0; + protected Dictionary m_groupPowers = new Dictionary(); /* Instantiated Designated Event Delegates */ //- used so we don't create new objects for each incoming packet and then toss it out later */ @@ -292,6 +293,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP get { return m_activeGroupPowers; } } + public ulong GetGroupPowers(LLUUID groupID) + { + if(m_groupPowers.ContainsKey(groupID)) + return m_groupPowers[groupID]; + return 0; + } + /// /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. /// diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 4b42f9e835..2ae4ae07ca 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -365,6 +365,11 @@ namespace OpenSim.Region.Environment.Modules.World.NPC get { return 0; } } + public ulong GetGroupPowers(LLUUID groupID) + { + return 0; + } + public virtual int NextAnimationSequenceNumber { get { return 1; } diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 22feab68ab..f0442ac48f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -277,6 +277,11 @@ namespace OpenSim.Region.Examples.SimpleModule get { return 0; } } + public ulong GetGroupPowers(LLUUID groupID) + { + return 0; + } + public virtual int NextAnimationSequenceNumber { get { return 1; }