From 8143c597fc5f62ec0d931d2d5b887730e06aec04 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 27 Sep 2007 13:25:45 +0000 Subject: * Tleiades grid mode inventory (#444) - thanx Tleiades! * updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423) --- OpenSim/Framework/Data/InventoryData.cs | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'OpenSim/Framework/Data') diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs index 2df26e1..dc857d8 100644 --- a/OpenSim/Framework/Data/InventoryData.cs +++ b/OpenSim/Framework/Data/InventoryData.cs @@ -25,15 +25,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ +using System; +using System.Xml.Serialization; using System.Collections.Generic; using libsecondlife; namespace OpenSim.Framework.Data { + + public enum InventoryCategory : byte { Library, Default, User }; /// /// Inventory Item - contains all the properties associated with an individual inventory piece. /// - public class InventoryItemBase + public class InventoryItemBase : MarshalByRefObject { /// /// A UUID containing the ID for the inventory item itself @@ -66,10 +70,12 @@ namespace OpenSim.Framework.Data /// /// The name of the inventory item (must be less than 64 characters) /// + [XmlElement(ElementName="name")] public string inventoryName; /// /// The description of the inventory item (must be less than 64 characters) /// + [XmlElement(ElementName = "description")] public string inventoryDescription; /// /// A mask containing the permissions for the next owner (cannot be enforced) @@ -92,7 +98,7 @@ namespace OpenSim.Framework.Data /// /// A Class for folders which contain users inventory /// - public class InventoryFolderBase + public class InventoryFolderBase : MarshalByRefObject { /// /// The name of the folder (64 characters or less) @@ -118,6 +124,10 @@ namespace OpenSim.Framework.Data /// /// public ushort version; + /// + /// Inventory category, Library, Default, System + /// + public InventoryCategory category; } /// @@ -162,13 +172,6 @@ namespace OpenSim.Framework.Data List getUserRootFolders(LLUUID user); /// - /// Returns the users inventory root folder. - /// - /// The UUID of the user who is having inventory being returned - /// Root inventory folder - InventoryFolderBase getUserRootFolder(LLUUID user); - - /// /// Returns a list of inventory folders contained in the folder 'parentID' /// /// The folder to get subfolders for @@ -218,5 +221,17 @@ namespace OpenSim.Framework.Data /// /// The inventory folder void updateInventoryFolder(InventoryFolderBase folder); + + /// + /// Delete a complete inventory category + /// + /// What folder category shout be deleted + void deleteInventoryCategory(InventoryCategory inventoryCategory); + + /// + /// Setup the initial folderset of a user + /// + /// + //void CreateNewUserInventory(LLUUID user); } } -- cgit v1.1