5 files changed, 78 insertions, 10 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 2a495b0..f9c13f3 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -338,11 +338,30 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public bool IsBanned(UUID avatarID)
+        public bool IsBanned(UUID avatarID, int userFlags)
         {
             foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
+
+            if (!IsEstateManager(avatarID) && !HasAccess(avatarID))
+            {
+                if (DenyMinors)
+                {
+                    if ((userFlags & 32) == 0)
+                    {
+                        return true;
+                    }
+                }
+                if (DenyAnonymous)
+                {
+                    if ((userFlags & 4) == 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+
             return false;
         }
 
@@ -350,7 +369,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);
         }
 
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index e7f8bfc..e131260 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -217,12 +217,12 @@ namespace OpenSim.Framework.Tests
                               BannedHostNameMask = string.Empty,
                               BannedUserID = bannedUserId}
                           );
-            Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not.");
-            Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is.");
+            Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not.");
+            Assert.IsFalse(es.IsBanned(UUID.Zero, 32), "User Should not be banned but is.");
 
             es.RemoveBan(bannedUserId);
 
-            Assert.IsFalse(es.IsBanned(bannedUserId), "User Should not be banned but is.");
+            Assert.IsFalse(es.IsBanned(bannedUserId, 32), "User Should not be banned but is.");
 
             es.AddEstateManager(UUID.Zero);
 
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index c023a6f..cbc2fd6 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -88,7 +88,13 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
 
         public void AddCapsHandler(UUID agentId)
         {
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
+            int flags = 0;
+            ScenePresence sp;
+            if (m_scene.TryGetScenePresence(agentId, out sp))
+            {
+                flags = sp.UserFlags;
+            }
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                 return;
 
             String capsObjectPath = GetCapsPath(agentId);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a4f630a..2ca82ca 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2443,7 +2443,15 @@ namespace OpenSim.Region.Framework.Scenes
             // If the user is banned, we won't let any of their objects
             // enter. Period.
             //
-            if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID))
+            int flags = 0;
+            ScenePresence sp;
+            if (TryGetScenePresence(sceneObject.OwnerID, out sp))
+            {
+                flags = sp.UserFlags;
+            }
+            
+
+            if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags))
             {
                 m_log.Info("[INTERREGION]: Denied prim crossing for " +
                         "banned avatar");
@@ -2472,7 +2480,7 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart RootPrim = sceneObject.RootPart;
 
                 // Fix up attachment Parent Local ID
-                ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
+                sp = GetScenePresence(sceneObject.OwnerID);
 
                 if (sp != null)
                 {
@@ -3617,8 +3625,29 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (m_regInfo.EstateSettings != null)
             {
-                if ((!m_seeIntoBannedRegion) && m_regInfo.EstateSettings.IsBanned(agent.AgentID))
+                int flags = 0;
+                ScenePresence sp;
+                if (TryGetScenePresence(agent.AgentID, out sp))
                 {
+                    flags = sp.UserFlags;
+                }
+                if ((!m_seeIntoBannedRegion) && m_regInfo.EstateSettings.IsBanned(agent.AgentID, flags))
+                {
+                    //Add some more info to help users
+                    if (!m_regInfo.EstateSettings.IsBanned(agent.AgentID, 32))
+                    {
+                        m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the region requires age verification",
+                                     agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
+                        reason = String.Format("Denied access to region (0): Region requires age verification");
+                        return false;
+                    }
+                    if (!m_regInfo.EstateSettings.IsBanned(agent.AgentID, 4))
+                    {
+                        m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the region requires payment info on file",
+                                     agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
+                        reason = String.Format("Denied access to region (0): Region requires payment info on file");
+                        return false;
+                    }
                     m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
                     reason = String.Format("Denied access to region {0}: You have been banned from that region.",
@@ -3807,7 +3836,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             // We have to wait until the viewer contacts this region after receiving EAC.
             // That calls AddNewClient, which finally creates the ScenePresence
-            if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID))
+            int flags = 0;
+            ScenePresence sp;
+            if (TryGetScenePresence(cAgentData.AgentID, out sp))
+            {
+                flags = sp.UserFlags;
+            }
+            if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
             {
                 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
                 return false;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6a3983f..c4ae0f0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return m_attachments; }
         }
+
         protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
 
         private Dictionary<UUID, ScriptControllers> scriptedcontrols = new Dictionary<UUID, ScriptControllers>();
@@ -136,6 +137,12 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_updateflag;
         private byte m_movementflag;
         private Vector3? m_forceToApply;
+        private int m_userFlags;
+        public int UserFlags
+        {
+            get { return m_userFlags; }
+        }
+
         private uint m_requestedSitTargetID;
         private UUID m_requestedSitTargetUUID;
         public bool SitGround = false;
@@ -763,6 +770,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_localId = m_scene.AllocateLocalId();
 
             UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
+            m_userFlags = account.UserFlags;
 
             if (account != null)
                 m_userLevel = account.UserLevel;