diff options
| author | Melanie | 2010-03-10 05:31:34 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-10 05:31:34 +0000 |
| commit | 04a6b1caf8033a413efce7db4cda4de4bf935a01 (patch) | |
| tree | 6c183f5aefab006de188f7d167f5ba11d1615577 /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Formatting cleanup. Add copyright notices. (diff) | |
| download | opensim-SC_OLD-04a6b1caf8033a413efce7db4cda4de4bf935a01.zip opensim-SC_OLD-04a6b1caf8033a413efce7db4cda4de4bf935a01.tar.gz opensim-SC_OLD-04a6b1caf8033a413efce7db4cda4de4bf935a01.tar.bz2 opensim-SC_OLD-04a6b1caf8033a413efce7db4cda4de4bf935a01.tar.xz | |
Reintroduce a check that was dropped from permissions
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -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 845c4c2..5c7f3b7 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -618,7 +618,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 618 | return objectOwnerMask; | 618 | return objectOwnerMask; |
| 619 | 619 | ||
| 620 | // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set | 620 | // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set |
| 621 | if (IsEstateManager(user) && m_RegionOwnerIsGod) | 621 | if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner)) |
| 622 | return objectOwnerMask; | 622 | return objectOwnerMask; |
| 623 | 623 | ||
| 624 | // Admin should be able to edit anything in the sim (including admin objects) | 624 | // Admin should be able to edit anything in the sim (including admin objects) |