From f0dd115a8c5c44ebde4631df3469c6e39510325f Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 26 Jul 2007 17:41:31 +0000 Subject: More work on inventory and opensim library. Fixed a number of bugs in the AssetCache related to asset downloading. --- .../Communications/Cache/LibraryRootFolder.cs | 62 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 10 deletions(-) (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs') diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 18803c0..bcfce3f 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -9,6 +9,7 @@ namespace OpenSim.Framework.Communications.Caches public class LibraryRootFolder : InventoryFolder { private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); + private InventoryFolder m_textureFolder; public LibraryRootFolder() { @@ -19,11 +20,22 @@ namespace OpenSim.Framework.Communications.Caches this.type = (short)-1; this.version = (ushort) 1; + InventoryFolder folderInfo = new InventoryFolder(); + folderInfo.agentID = libOwner; + folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001"); + folderInfo.name = "My Inventory"; + folderInfo.parentID = this.folderID; + folderInfo.type = -1; + folderInfo.version = 1; + this.SubFolders.Add(folderInfo.folderID, folderInfo); + this.m_textureFolder = folderInfo; + this.CreateLibraryItems(); } private void CreateLibraryItems() { + InventoryItemBase item = new InventoryItemBase(); item.avatarID = libOwner; item.creatorsID = libOwner; @@ -32,12 +44,12 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryDescription = "Plywood texture"; item.inventoryName = "Plywood"; item.type = 0; - item.parentFolderID = this.folderID; + item.parentFolderID = m_textureFolder.folderID; item.inventoryBasePermissions = 0x7FFFFFFF; item.inventoryEveryOnePermissions = 0x7FFFFFFF; item.inventoryCurrentPermissions = 0x7FFFFFFF; item.inventoryNextPermissions = 0x7FFFFFFF; - this.Items.Add(item.inventoryID, item); + this.m_textureFolder.Items.Add(item.inventoryID, item); item = new InventoryItemBase(); item.avatarID = libOwner; @@ -47,12 +59,12 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryDescription = "Rocks texture"; item.inventoryName = "Rocks"; item.type = 0; - item.parentFolderID = this.folderID; + item.parentFolderID = m_textureFolder.folderID; item.inventoryBasePermissions = 0x7FFFFFFF; item.inventoryEveryOnePermissions = 0x7FFFFFFF; item.inventoryCurrentPermissions = 0x7FFFFFFF; item.inventoryNextPermissions = 0x7FFFFFFF; - this.Items.Add(item.inventoryID, item); + this.m_textureFolder.Items.Add(item.inventoryID, item); item = new InventoryItemBase(); item.avatarID = libOwner; @@ -62,12 +74,12 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryDescription = "Bricks texture"; item.inventoryName = "Bricks"; item.type = 0; - item.parentFolderID = this.folderID; + item.parentFolderID = m_textureFolder.folderID; item.inventoryBasePermissions = 0x7FFFFFFF; item.inventoryEveryOnePermissions = 0x7FFFFFFF; item.inventoryCurrentPermissions = 0x7FFFFFFF; item.inventoryNextPermissions = 0x7FFFFFFF; - this.Items.Add(item.inventoryID, item); + this.m_textureFolder.Items.Add(item.inventoryID, item); item = new InventoryItemBase(); item.avatarID = libOwner; @@ -77,12 +89,12 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryDescription = "Granite texture"; item.inventoryName = "Granite"; item.type = 0; - item.parentFolderID = this.folderID; + item.parentFolderID = m_textureFolder.folderID; item.inventoryBasePermissions = 0x7FFFFFFF; item.inventoryEveryOnePermissions = 0x7FFFFFFF; item.inventoryCurrentPermissions = 0x7FFFFFFF; item.inventoryNextPermissions = 0x7FFFFFFF; - this.Items.Add(item.inventoryID, item); + this.m_textureFolder.Items.Add(item.inventoryID, item); item = new InventoryItemBase(); item.avatarID = libOwner; @@ -92,12 +104,12 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryDescription = "Hardwood texture"; item.inventoryName = "Hardwood"; item.type = 0; - item.parentFolderID = this.folderID; + item.parentFolderID = m_textureFolder.folderID; item.inventoryBasePermissions = 0x7FFFFFFF; item.inventoryEveryOnePermissions = 0x7FFFFFFF; item.inventoryCurrentPermissions = 0x7FFFFFFF; item.inventoryNextPermissions = 0x7FFFFFFF; - this.Items.Add(item.inventoryID, item); + this.m_textureFolder.Items.Add(item.inventoryID, item); item = new InventoryItemBase(); item.avatarID = libOwner; @@ -111,6 +123,36 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryCurrentPermissions = 0; item.inventoryNextPermissions = 0; this.Items.Add(item.inventoryID, item); + + item = new InventoryItemBase(); + item.avatarID = libOwner; + item.creatorsID = libOwner; + item.inventoryID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"); + item.assetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); + item.inventoryDescription = "Default Skin"; + item.inventoryName = "Default Skin"; + item.type = 13; + item.parentFolderID = this.folderID; + item.inventoryCurrentPermissions = 0; + item.inventoryNextPermissions = 0; + this.Items.Add(item.inventoryID, item); + + item = new InventoryItemBase(); + item.avatarID = libOwner; + item.creatorsID = libOwner; + item.inventoryID = new LLUUID("00000000-0000-2222-4444-000000000001"); + item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001"); + item.inventoryDescription = "Welcome"; + item.inventoryName = "Welcome"; + item.type = 7; + item.parentFolderID = this.folderID; + item.inventoryCurrentPermissions = (1 << 15); + item.inventoryNextPermissions = (1 << 15); + item.inventoryEveryOnePermissions = (1 << 15); + item.inventoryBasePermissions = (1 << 15); + this.Items.Add(item.inventoryID, item); + + } } -- cgit v1.1