diff options
author | Melanie Thielker | 2008-07-25 03:45:17 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-25 03:45:17 +0000 |
commit | 06e0e513cf194d97d576c111e5c481cc769bba1f (patch) | |
tree | 6cdb0ff7f86bc71a8d18847c64bde2547f70aed8 /OpenSim | |
parent | *Fixes #0001818: typecast string to float (diff) | |
download | opensim-SC_OLD-06e0e513cf194d97d576c111e5c481cc769bba1f.zip opensim-SC_OLD-06e0e513cf194d97d576c111e5c481cc769bba1f.tar.gz opensim-SC_OLD-06e0e513cf194d97d576c111e5c481cc769bba1f.tar.bz2 opensim-SC_OLD-06e0e513cf194d97d576c111e5c481cc769bba1f.tar.xz |
Add GetGroupPowers() and a dictionary to hold them to ClientView and
IClientAPI. No user functionality
Diffstat (limited to 'OpenSim')
4 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a97ce5e..742b211 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -317,6 +317,8 @@ namespace OpenSim.Framework | |||
317 | string ActiveGroupName { get; } | 317 | string ActiveGroupName { get; } |
318 | 318 | ||
319 | ulong ActiveGroupPowers { get; } | 319 | ulong ActiveGroupPowers { get; } |
320 | |||
321 | ulong GetGroupPowers(LLUUID groupID); | ||
320 | 322 | ||
321 | string FirstName { get; } | 323 | string FirstName { get; } |
322 | 324 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a7dd35a..0c420b4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -115,6 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
115 | protected LLUUID m_activeGroupID = LLUUID.Zero; | 115 | protected LLUUID m_activeGroupID = LLUUID.Zero; |
116 | protected string m_activeGroupName = String.Empty; | 116 | protected string m_activeGroupName = String.Empty; |
117 | protected ulong m_activeGroupPowers = 0; | 117 | protected ulong m_activeGroupPowers = 0; |
118 | protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>(); | ||
118 | 119 | ||
119 | /* Instantiated Designated Event Delegates */ | 120 | /* Instantiated Designated Event Delegates */ |
120 | //- used so we don't create new objects for each incoming packet and then toss it out later */ | 121 | //- 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 | |||
292 | get { return m_activeGroupPowers; } | 293 | get { return m_activeGroupPowers; } |
293 | } | 294 | } |
294 | 295 | ||
296 | public ulong GetGroupPowers(LLUUID groupID) | ||
297 | { | ||
298 | if(m_groupPowers.ContainsKey(groupID)) | ||
299 | return m_groupPowers[groupID]; | ||
300 | return 0; | ||
301 | } | ||
302 | |||
295 | /// <summary> | 303 | /// <summary> |
296 | /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. | 304 | /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. |
297 | /// </summary> | 305 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 4b42f9e..2ae4ae0 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 | |||
365 | get { return 0; } | 365 | get { return 0; } |
366 | } | 366 | } |
367 | 367 | ||
368 | public ulong GetGroupPowers(LLUUID groupID) | ||
369 | { | ||
370 | return 0; | ||
371 | } | ||
372 | |||
368 | public virtual int NextAnimationSequenceNumber | 373 | public virtual int NextAnimationSequenceNumber |
369 | { | 374 | { |
370 | get { return 1; } | 375 | get { return 1; } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 22feab6..f0442ac 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -277,6 +277,11 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
277 | get { return 0; } | 277 | get { return 0; } |
278 | } | 278 | } |
279 | 279 | ||
280 | public ulong GetGroupPowers(LLUUID groupID) | ||
281 | { | ||
282 | return 0; | ||
283 | } | ||
284 | |||
280 | public virtual int NextAnimationSequenceNumber | 285 | public virtual int NextAnimationSequenceNumber |
281 | { | 286 | { |
282 | get { return 1; } | 287 | get { return 1; } |