Patch #9151

Makes the estate dialog fully functional. Implements all client facing functionality. Moves estate data from estate_settings.xml, which is used to provide defaults, to the region data store. Creates one estate for each region, and places the region in it. Converts all region bans to estate bans.

1 files changed, 1 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 41bb610..b0d9a26 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -246,17 +246,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
 
         protected bool IsEstateManager(LLUUID user)
         {
-            if (user != LLUUID.Zero)
-            {
-                LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
-                foreach (LLUUID estatemanager in estatemanagers)
-                {
-                    if (estatemanager == user)
-                        return true;
-                }
-            }
-
-            return false;
+            return m_scene.RegionInfo.EstateSettings.IsEstateManager(user);
         }
 #endregion