1 files changed, 37 insertions, 5 deletions

diff --git a/OpenSim/Region/Caches/UserProfileCache.cs b/OpenSim/Framework/Communications/caches/UserProfileCache.cs
index 0717e55..0ee63ba 100644
--- a/OpenSim/Region/Caches/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/caches/UserProfileCache.cs
@@ -3,16 +3,19 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 using OpenSim.Framework.Data;

+using OpenSim.Framework.Communications;

 

-namespace OpenSim.Region.Caches

+namespace OpenSim.Framework.Communications.Caches

 {

     public class UserProfileCache

     {

         public Dictionary<LLUUID, CachedUserInfo> UserProfiles = new Dictionary<LLUUID, CachedUserInfo>();

 

-        public UserProfileCache()

-        {

+        private CommunicationsManager m_parent;

 

+        public UserProfileCache(CommunicationsManager parent)

+        {

+            m_parent = parent;

         }

 

         /// <summary>

@@ -22,7 +25,36 @@ namespace OpenSim.Region.Caches
         /// <param name="userID"></param>

         public void AddNewUser(LLUUID userID)

         {

+            if (!this.UserProfiles.ContainsKey(userID))

+            {

+                CachedUserInfo userInfo = new CachedUserInfo();

+                userInfo.UserProfile = this.RequestUserProfileForUser(userID);

+                this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);

+                if (userInfo.UserProfile != null)

+                {

+                    this.UserProfiles.Add(userID, userInfo);

+                }

+                else

+                {

+                    //no profile for this user, what do we do now?

+                }

+            }

+            else

+            {

+                //already have a cached profile for this user

+                //we should make sure its upto date with the user server version

+            }

+        }

 

+        /// <summary>

+        /// A new user has moved into a region in this instance

+        /// so get info from servers

+        /// </summary>

+        /// <param name="firstName"></param>

+        /// <param name="lastName"></param>

+        public void AddNewUser(string firstName, string lastName)

+        {

+            

         }

 

         /// <summary>

@@ -40,9 +72,9 @@ namespace OpenSim.Region.Caches
         /// Request the user profile from User server

         /// </summary>

         /// <param name="userID"></param>

-        private void RequestUserProfileForUser(LLUUID userID)

+        private UserProfileData RequestUserProfileForUser(LLUUID userID)

         {

-

+            return this.m_parent.UserServer.GetUserProfile(userID);

         }

 

         /// <summary>