diff options
author | Melanie | 2010-01-10 22:41:42 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 22:41:42 +0000 |
commit | 3c90d834eac382af5edf091e83aea1ffcce91792 (patch) | |
tree | 60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Region/CoreModules/World/Permissions | |
parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
download | opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.zip opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2 opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz |
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index aaebd00..ee76440 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -477,12 +477,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
477 | { | 477 | { |
478 | if (user == UUID.Zero) return false; | 478 | if (user == UUID.Zero) return false; |
479 | 479 | ||
480 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) | ||
481 | { | ||
482 | if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)) | ||
483 | return true; | ||
484 | } | ||
485 | |||
486 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 480 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
487 | { | 481 | { |
488 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 482 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) |