From 40fa68d3e503d5df7bc10daa98fbe8302ea81efc Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 19 Aug 2008 20:55:34 +0000
Subject: Mantis #1999 Allow the sim owner to add estate managers to any estate
 on the sim

---
 .../Region/Environment/Modules/World/Permissions/PermissionsModule.cs  | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 071e3af..eb078d6 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -644,6 +644,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                 if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+                if (IsAdministrator(user))
+                    return true;
+
                 if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user))
                     return true;
 
-- 
cgit v1.1