1 files changed, 34 insertions, 2 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 4df7860..4c9f6e9 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -365,9 +365,41 @@ namespace OpenSim.Framework
 
         public bool IsBanned(UUID avatarID)
         {
-            foreach (EstateBan ban in l_EstateBans)
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
+                    if (ban.BannedUserID == avatarID)
+                        return true;
+            }
+            return false;
+        }
+
+        public bool IsBanned(UUID avatarID, int userFlags)
+        {
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
+
+                if (!HasAccess(avatarID))
+                {
+                    if (DenyMinors)
+                    {
+                        if ((userFlags & 32) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                    if (DenyAnonymous)
+                    {
+                        if ((userFlags & 4) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
             return false;
         }
 
@@ -375,7 +407,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID))
+            if (!IsBanned(ban.BannedUserID, 32)) //Ignore age-based bans
                 l_EstateBans.Add(ban);
         }