1 files changed, 25 insertions, 12 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 3aec437..4c9f6e9 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -363,30 +363,43 @@ namespace OpenSim.Framework
             return false;
         }
 
+        public bool IsBanned(UUID avatarID)
+        {
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
+                    if (ban.BannedUserID == avatarID)
+                        return true;
+            }
+            return false;
+        }
+
         public bool IsBanned(UUID avatarID, int userFlags)
         {
-            foreach (EstateBan ban in l_EstateBans)
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
 
-            if (!IsEstateManagerOrOwner(avatarID) && !HasAccess(avatarID))
-            {
-                if (DenyMinors)
+                if (!HasAccess(avatarID))
                 {
-                    if ((userFlags & 32) == 0)
+                    if (DenyMinors)
                     {
-                        return true;
+                        if ((userFlags & 32) == 0)
+                        {
+                            return true;
+                        }
                     }
-                }
-                if (DenyAnonymous)
-                {
-                    if ((userFlags & 4) == 0)
+                    if (DenyAnonymous)
                     {
-                        return true;
+                        if ((userFlags & 4) == 0)
+                        {
+                            return true;
+                        }
                     }
                 }
             }
-
             return false;
         }