From c7fd036b3552a4ed766fd7cdbfe42fe16c169369 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 30 Apr 2009 15:38:10 +0000 Subject: [PATCH] Estate owners who are not administrators, even in god mode, should not be able to edit a real god's objects. Minor tweak. --- .../Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 6c6151ec3b..874e8b7cdc 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -460,7 +460,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions // return objectEveryoneMask; // Estate users should be able to edit anything in the sim - if (IsEstateManager(user) && m_RegionOwnerIsGod) + if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner))) return objectOwnerMask; // Admin should be able to edit anything in the sim (including admin objects)