From 71cc4586105d667291d5e4d0c35daba2ee29b881 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Wed, 13 Aug 2008 01:17:44 +0000
Subject: [PATCH] Make the estate owner UUID from the database have the same
 rights as the region master avatar, unless it's LLUUID.Zero (the default).

---
 .../Modules/World/Permissions/PermissionsModule.cs        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index f9a0bdb543..0dfcb44176 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -238,7 +238,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             // If there is no master avatar, return false
             if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
             {
-                return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
+                if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user)
+                    return true;
+            }
+            if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+            {
+                if(m_scene.RegionInfo.EstateSettings.EstateOwner == user)
+                    return true;
             }
 
             return false;