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
     public interface IEstateModule : IRegionModule
     {
         uint GetRegionFlags();
+        bool IsManager(LLUUID avatarID);
     }
 }
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
 
             return (uint)flags;
         }
+
+        public bool IsManager(LLUUID avatarID)
+        {
+            if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID)
+                return true;
+
+            List<LLUUID> ems = new List<LLUUID>(m_scene.RegionInfo.EstateSettings.EstateManagers);
+            if(ems.Contains(avatarID))
+                return true;
+
+            return false;
+        }
     }
 }