aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 6c6151e..874e8b7 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
460 // return objectEveryoneMask; 460 // return objectEveryoneMask;
461 461
462 // Estate users should be able to edit anything in the sim 462 // Estate users should be able to edit anything in the sim
463 if (IsEstateManager(user) && m_RegionOwnerIsGod) 463 if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)))
464 return objectOwnerMask; 464 return objectOwnerMask;
465 465
466 // Admin should be able to edit anything in the sim (including admin objects) 466 // Admin should be able to edit anything in the sim (including admin objects)