1 files changed, 58 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 5aa87d3..b510d0a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using Nini.Config;
 using log4net;
 using Mono.Addins;
@@ -34,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
+using OpenSim.Framework;
 
 using OpenMetaverse;
 
@@ -50,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         private bool m_Enabled = false;
         private UserAccountCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -103,6 +106,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
 
             scene.RegisterModuleInterface<IUserAccountService>(this);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
+
+            scene.EventManager.OnNewClient += OnNewClient;
         }
 
         public void RemoveRegion(Scene scene)
@@ -117,12 +123,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
         }
 
+        // When a user actually enters the sim, clear them from
+        // cache so the sim will have the current values for
+        // flags, title, etc. And country, don't forget country!
+        private void OnNewClient(IClientAPI client)
+        {
+            m_Cache.Remove(client.Name);
+        }
+
         #region Overwritten methods from IUserAccountService
 
         public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(userID, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(userID, out inCache);
             if (inCache)
                 return account;
 
@@ -135,7 +150,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public override UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(firstName + " " + lastName, out inCache);
             if (inCache)
                 return account;
 
@@ -146,6 +162,45 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             return account;
         }
 
+        public override List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
+        {
+            List<UserAccount> accs = new List<UserAccount>();
+            List<string> missing = new List<string>();
+
+            UUID uuid = UUID.Zero;
+            UserAccount account;
+            bool inCache = false;
+
+            foreach(string id in IDs)
+            {
+                if(UUID.TryParse(id, out uuid))
+                {
+                    account = m_Cache.Get(uuid, out inCache);
+                    if (inCache)
+                        accs.Add(account);
+                    else
+                        missing.Add(id);
+                }
+            }
+
+            if(missing.Count > 0)
+            {
+                List<UserAccount> ext = base.GetUserAccounts(scopeID, missing);
+                if(ext != null && ext.Count >0 )
+                {
+                    foreach(UserAccount acc in ext)
+                    {
+                        if(acc != null)
+                        {
+                            accs.Add(acc);
+                            m_Cache.Cache(acc.PrincipalID, acc);
+                        }
+                    }
+                }
+            }
+            return accs;
+        }
+
         public override bool StoreUserAccount(UserAccount data)
         {
             // This remote connector refuses to serve this method