2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 14bb9ef..4f34757 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -360,6 +360,9 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
+            if (IsEstateManager(user))
+                return true;
+
             return l_EstateAccess.Contains(user);
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8d134df..73daab8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1848,14 +1848,14 @@ namespace OpenSim.Region.Framework.Scenes
         {
             bool welcome  = true;
 
-            if(m_regInfo.EstateSettings.IsBanned(client.AgentId))
+            if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
             {
                 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
                                 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
                 client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region.");
                 welcome = false;
             }
-            else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId))
+            else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId) && !Permissions.IsGod(client.AgentId))
             {
                 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access",
                                 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);