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.  

9 files changed, 188 insertions, 9 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>

diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index fe2e25c..7253cc7 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Data
         /// </summary>

         public int type;

         /// <summary>

-        /// The folder this item is contained in (NULL_KEY = Inventory Root)

+        /// The folder this item is contained in 

         /// </summary>

         public LLUUID parentFolderID;

         /// <summary>

@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Data
         /// </summary>

         public LLUUID avatarID;

         /// <summary>

-        /// The creator of this folder

+        /// The creator of this item

         /// </summary>

         public LLUUID creatorsID;

         /// <summary>

@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Data
         /// </summary>

         public LLUUID agentID;

         /// <summary>

-        /// The folder this folder is contained in (NULL_KEY for root)

+        /// The folder this folder is contained in 

         /// </summary>

         public LLUUID parentID;

         /// <summary>

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 1b0c682..fe1e9dc 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -30,6 +30,7 @@ using System.Net;
 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Types;

+using OpenSim.Framework.Data;

 

 namespace OpenSim.Framework.Interfaces

 {

@@ -176,5 +177,8 @@ namespace OpenSim.Framework.Interfaces
         void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);

         void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID);

         void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);

+    

+        void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);

+        void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);

     }

 }

diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
new file mode 100644
index 0000000..302dbff
--- /dev/null
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -0,0 +1,44 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.IO;

+

+namespace OpenSim.Framework.Servers

+{

+

+    public class BinaryStreamHandler : BaseStreamHandler

+    {

+        BinaryMethod m_restMethod;

+

+        override public byte[] Handle(string path, Stream request)

+        {

+            byte[] data = ReadFully(request);

+            string param = GetParam(path);

+            string responseString = m_restMethod(data, path, param);

+

+            return Encoding.UTF8.GetBytes(responseString);

+        }

+

+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod restMethod)

+            : base(httpMethod, path)

+        {

+            m_restMethod = restMethod;

+        }

+

+        public byte[] ReadFully(Stream stream)

+        {

+            byte[] buffer = new byte[32768];

+            using (MemoryStream ms = new MemoryStream())

+            {

+                while (true)

+                {

+                    int read = stream.Read(buffer, 0, buffer.Length);

+                    if (read <= 0)

+                        return ms.ToArray();

+                    ms.Write(buffer, 0, read);

+                }

+            }

+        }

+    }

+

+}

diff --git a/OpenSim/Framework/Servers/RestMethod.cs b/OpenSim/Framework/Servers/RestMethod.cs
index c6cb230..2a92fc1 100644
--- a/OpenSim/Framework/Servers/RestMethod.cs
+++ b/OpenSim/Framework/Servers/RestMethod.cs
@@ -28,4 +28,5 @@
 namespace OpenSim.Framework.Servers

 {

     public delegate string RestMethod( string request, string path, string param );

+    public delegate string BinaryMethod(byte[] data, string path, string param);

 }