From 3ecf712e4dd5318442e7c853eb43299840594ce5 Mon Sep 17 00:00:00 2001
From: Tom
Date: Wed, 26 Jan 2011 14:20:39 -0800
Subject: Add userFlags check to isBanned. This checks bans against
 DenyAnonymous and DenyMinors.  Note that the ban doesn't actually work yet
 due to some stuff mel's working on .

---
 .../Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

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);
-- 
cgit v1.1