Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/

2 files changed, 14 insertions, 10 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index cbc2fd6..5c5cb70 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -88,12 +88,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
 
         public void AddCapsHandler(UUID agentId)
         {
-            int flags = 0;
-            ScenePresence sp;
-            if (m_scene.TryGetScenePresence(agentId, out sp))
-            {
-                flags = sp.UserFlags;
-            }
+            int flags = m_scene.GetUserFlags(agentId);
             if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                 return;
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 9ecbcc6..54340e6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -142,10 +142,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            bool inCache = false;
-            UserAccount account = m_Cache.Get(userID, out inCache);
-            if (inCache)
-                return account;
+            return GetUserAccount(scopeID, userID, true);
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID, bool useCache)
+        {
+            UserAccount account;
+            if (useCache)
+            {
+                bool inCache = false;
+                account = m_Cache.Get(userID, out inCache);
+                if (inCache)
+                    return account;
+            }
 
             account = m_UserService.GetUserAccount(scopeID, userID);
             m_Cache.Cache(userID, account);