From c2f1771c63108c78b799a4f107cabe7e33984866 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 14 Aug 2008 18:08:22 +0000
Subject: Make the estate owner work. Changes permissions checks to allow the
 estate owner user the ability to add and remove estate managers, and have EM
 rights outside of that.

---
 .../Environment/Modules/World/Permissions/PermissionsModule.cs    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 0dfcb44..25ea282 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -626,11 +626,17 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 return GenericCommunicationPermission(user, target);
             }
 
-            private bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene)
+            private bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene, bool ownerCommand)
             {
                 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
                 if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+                if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user))
+                    return true;
+
+                if (ownerCommand)
+                    return false;
+
                 return GenericEstatePermission(user);
             }
 
-- 
cgit v1.1