diff options
| author | Melanie Thielker | 2009-04-30 15:38:10 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-04-30 15:38:10 +0000 |
| commit | c7fd036b3552a4ed766fd7cdbfe42fe16c169369 (patch) | |
| tree | 3d07070d4990c7c842d0dd5fcd6c17679aaab90e /OpenSim | |
| parent | Thank you, mpallari, for a patch that correct the behavior of the avatar (diff) | |
| download | opensim-SC-c7fd036b3552a4ed766fd7cdbfe42fe16c169369.zip opensim-SC-c7fd036b3552a4ed766fd7cdbfe42fe16c169369.tar.gz opensim-SC-c7fd036b3552a4ed766fd7cdbfe42fe16c169369.tar.bz2 opensim-SC-c7fd036b3552a4ed766fd7cdbfe42fe16c169369.tar.xz | |
Estate owners who are not administrators, even in god mode, should not be
able to edit a real god's objects. Minor tweak.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
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) |