diff options
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
-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) |