From b2c6f316e16e9bb33f81997319a4130fa683bc48 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 19 Jul 2007 20:21:02 +0000
Subject: Some work on Inventory (not yet finished or enabled)

---
 OpenSim/Framework/General/AgentInventory.cs        | 10 +++-------
 OpenSim/Framework/General/Interfaces/IClientAPI.cs | 13 +++++++++++--
 OpenSim/Framework/General/NullClientAPI.cs         |  8 +++++++-
 3 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Framework/General')

diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index 0aeb0b3..4c80791 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -52,12 +52,11 @@ namespace OpenSim.Framework.Inventory
 
         public virtual void Initialise()
         {
-            Wearables = new AvatarWearable[13]; //should be 12 of these
+            Wearables = new AvatarWearable[13]; 
             for (int i = 0; i < 13; i++)
             {
                 Wearables[i] = new AvatarWearable();
             }
-      
         }
 
         public bool CreateNewFolder(LLUUID folderID, ushort type)
@@ -96,11 +95,10 @@ namespace OpenSim.Framework.Inventory
             Folder.DefaultType = type;
             Folder.FolderName = folderName;
             this.InventoryFolders.Add(Folder.FolderID, Folder);
-
             return (true);
         }
 
-        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)
+        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parentID)
         {
             if (!this.InventoryFolders.ContainsKey(folderID))
             {
@@ -110,10 +108,9 @@ namespace OpenSim.Framework.Inventory
                 Folder.OwnerID = this.AgentID;
                 Folder.DefaultType = type;
                 Folder.FolderName = folderName;
-                Folder.ParentID = parent;
+                Folder.ParentID = parentID;
                 this.InventoryFolders.Add(Folder.FolderID, Folder);
             }
-
             return (true);
         }
 
@@ -135,7 +132,6 @@ namespace OpenSim.Framework.Inventory
                     return inv.FolderID;
                 }
             }
-
             return LLUUID.Zero;
         }
 
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 808a857..df65027 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -80,7 +80,10 @@ namespace OpenSim.Framework.Interfaces
 
     public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
 
-    
+    public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID);
+    public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
+
+    public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
 
     public interface IClientAPI
     {
@@ -125,6 +128,10 @@ namespace OpenSim.Framework.Interfaces
         event NewAvatar OnNewAvatar;
         event GenericCall6 OnRemoveAvatar;
 
+        event CreateInventoryFolder OnCreateNewInventoryFolder;
+        event FetchInventoryDescendents OnFetchInventoryDescendents;
+        event RequestTaskInventory OnRequestTaskInventory;
+
         event UUIDNameRequest OnNameFromUUIDRequest;
 
         event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -188,8 +195,10 @@ namespace OpenSim.Framework.Interfaces
     
         void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
         void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item);
-        void SendNameReply(LLUUID profileId, string firstname, string lastname);
+        void SendInventoryItemUpdate(InventoryItemBase Item);
+        void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
 
+        void SendNameReply(LLUUID profileId, string firstname, string lastname);
         void SendAlertMessage(string message);
         void SendAgentAlertMessage(string message, bool modal);
     }
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index cfba228..18ac527 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -52,6 +52,10 @@ namespace OpenSim.Framework
        public event NewAvatar OnNewAvatar;
        public event GenericCall6 OnRemoveAvatar;
 
+       public event CreateInventoryFolder OnCreateNewInventoryFolder;
+       public event FetchInventoryDescendents OnFetchInventoryDescendents;
+       public event RequestTaskInventory OnRequestTaskInventory;
+
        public event UUIDNameRequest OnNameFromUUIDRequest;
 
        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
@@ -124,8 +128,10 @@ namespace OpenSim.Framework
 
        public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
        public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){}
-       public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
+       public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
+       public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
 
+       public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
        public void SendAlertMessage(string message) { }
        public void SendAgentAlertMessage(string message, bool modal) { }
    }
-- 
cgit v1.1