More work on UserProfile and inventory cache (still currently not enabled).

Asset uploading over CAPS now works, and although inventory isn't really working yet, this should now at least enables texturing of prims.  

5 files changed, 136 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 109d027..ebc9632 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -32,6 +32,7 @@ using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Servers;

+using OpenSim.Framework.Communications.Caches;

 

 namespace OpenSim.Framework.Communications

 {

@@ -40,12 +41,15 @@ namespace OpenSim.Framework.Communications
     {

         public IUserServices UserServer;

         public IGridServices GridServer;

+        public IInventoryServices InventoryServer;

         public IInterRegionCommunications InterRegion;

+        public UserProfileCache UserProfilesCache;

 

         public NetworkServersInfo ServersInfo;

         public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer)

         {

             ServersInfo = serversInfo;

+            UserProfilesCache = new UserProfileCache(this);

         }

 

         #region Packet Handlers

diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
new file mode 100644
index 0000000..0b05834
--- /dev/null
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -0,0 +1,17 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Data;

+using libsecondlife;

+using OpenSim.Framework.Communications.Caches;

+

+namespace OpenSim.Framework.Communications

+{

+    public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolder folderInfo);

+    public delegate void InventoryItemInfo(LLUUID userID, InventoryItemBase itemInfo);

+

+    public interface IInventoryServices

+    {

+        void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);

+    }

+}

diff --git a/OpenSim/Framework/Communications/caches/CachedUserInfo.cs b/OpenSim/Framework/Communications/caches/CachedUserInfo.cs
new file mode 100644
index 0000000..1c779e9
--- /dev/null
+++ b/OpenSim/Framework/Communications/caches/CachedUserInfo.cs
@@ -0,0 +1,77 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Data;

+using libsecondlife;

+

+namespace OpenSim.Framework.Communications.Caches

+{

+    public class CachedUserInfo

+    {

+        public UserProfileData UserProfile;

+        //public Dictionary<LLUUID, InventoryFolder> Folders = new Dictionary<LLUUID, InventoryFolder>();

+        public InventoryFolder RootFolder;

+

+        public CachedUserInfo()

+        {

+

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

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

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

+        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)

+        {

+            if (userID == UserProfile.UUID)

+            {

+                if (this.RootFolder == null)

+                {

+                    if (folderInfo.parentID == LLUUID.Zero)

+                    {

+                        this.RootFolder = folderInfo;

+                    }

+                }

+                else

+                {

+                    if (this.RootFolder.folderID == folderInfo.parentID)

+                    {

+                        this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);

+                    }

+                    else

+                    {

+                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(folderInfo.parentID);

+                        if (pFolder != null)

+                        {

+                            pFolder.SubFolders.Add(folderInfo.folderID, folderInfo);

+                        }

+                    }

+                }

+            }

+        }

+

+        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)

+        {

+            if (userID == UserProfile.UUID)

+            {

+                if (this.RootFolder != null)

+                {

+                    if (itemInfo.parentFolderID == this.RootFolder.folderID)

+                    {

+                        this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);

+                    }

+                    else

+                    {

+                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);

+                        if (pFolder != null)

+                        {

+                            pFolder.Items.Add(itemInfo.inventoryID, itemInfo);

+                        }

+                    }

+                }

+

+            }

+        }

+    }

+}

diff --git a/OpenSim/Region/Caches/InventoryFolder.cs b/OpenSim/Framework/Communications/caches/InventoryFolder.cs
index 364a184..eaddf19 100644
--- a/OpenSim/Region/Caches/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/caches/InventoryFolder.cs
@@ -4,7 +4,7 @@ using System.Text;
 using libsecondlife;

 using OpenSim.Framework.Data;

 

-namespace OpenSim.Region.Caches

+namespace OpenSim.Framework.Communications.Caches

 {

     public class InventoryFolder : InventoryFolderBase

     {

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>