aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-18 18:08:34 +0000
committerMelanie Thielker2008-07-18 18:08:34 +0000
commit76840906b596fb2c9e6225997c21923dc619953c (patch)
treec1017ee62d0d0472ae603e16ba395b95f7e62089
parentfixing copy & paste artefact. (diff)
downloadopensim-SC-76840906b596fb2c9e6225997c21923dc619953c.zip
opensim-SC-76840906b596fb2c9e6225997c21923dc619953c.tar.gz
opensim-SC-76840906b596fb2c9e6225997c21923dc619953c.tar.bz2
opensim-SC-76840906b596fb2c9e6225997c21923dc619953c.tar.xz
Patch adds bool IsManager(LLUUID) to IEstateModule.
Returns true whenever the LLUUID references a user who is either an EM or the region owner. Please note that ownership is region-scoped, while EM is estate-scoped.
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEstateModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs12
2 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
index 070b804..bfe3591 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
@@ -34,5 +34,6 @@ namespace OpenSim.Region.Environment.Interfaces
34 public interface IEstateModule : IRegionModule 34 public interface IEstateModule : IRegionModule
35 { 35 {
36 uint GetRegionFlags(); 36 uint GetRegionFlags();
37 bool IsManager(LLUUID avatarID);
37 } 38 }
38} 39}
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index c5c0370..f2b6ae0 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -796,5 +796,17 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
796 796
797 return (uint)flags; 797 return (uint)flags;
798 } 798 }
799
800 public bool IsManager(LLUUID avatarID)
801 {
802 if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID)
803 return true;
804
805 List<LLUUID> ems = new List<LLUUID>(m_scene.RegionInfo.EstateSettings.EstateManagers);
806 if(ems.Contains(avatarID))
807 return true;
808
809 return false;
810 }
799 } 811 }
800} 812}