From 997a2907e2e26d6ee09c4e222bfbc017e3229418 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 27 Dec 2007 15:17:22 +0000 Subject: [PATCH] Move hardcoded texture library inventory items out into OpenSimLibrary/xml. However, even before these change the five textures moved are not displaying (which is why default cubes are coming up as grey plywood unless you happen to have that texture cached). These were working before so they must have broken in the last month. Might be something to do with the fact that these identify (using file under linux) as jpeg2000 files, while all the other working textures identify simply as data. --- .../Communications/Cache/LibraryRootFolder.cs | 17 +---- .../Communications/InventoryServiceBase.cs | 4 +- .../Framework/Communications/LoginService.cs | 1 + bin/OpenSimAssetSet.xml | 35 ----------- bin/OpenSimLibrary.xml | 63 ++++++++++++++++++- 5 files changed, 66 insertions(+), 54 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index ffc94bfb55..4c8eddfa97 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -81,22 +81,7 @@ namespace OpenSim.Framework.Communications.Cache private void CreateLibraryItems() { - InventoryItemBase item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000002"), "Plywood", "Plywood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); - m_textureFolder.Items.Add(item.inventoryID, item); - - item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000003"), "Rocks", "Rocks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); - m_textureFolder.Items.Add(item.inventoryID, item); - - item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000001"), "Bricks", "Bricks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); - m_textureFolder.Items.Add(item.inventoryID, item); - - item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000004"), "Granite", "Granite texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); - m_textureFolder.Items.Add(item.inventoryID, item); - - item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000005"), "Hardwood", "Hardwood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); - m_textureFolder.Items.Add(item.inventoryID, item); - - item = CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", (int)AssetType.Bodypart, (int)InventoryType.Wearable, folderID); + InventoryItemBase item = CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", (int)AssetType.Bodypart, (int)InventoryType.Wearable, folderID); item.inventoryCurrentPermissions = 0; item.inventoryNextPermissions = 0; Items.Add(item.inventoryID, item); diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 638440837d..0797a848da 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs @@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications { if (!String.IsNullOrEmpty(FileName)) { - MainLog.Instance.Verbose("Inventory", "Inventorystorage: Attempting to load " + FileName); + MainLog.Instance.Verbose("AGENTINVENTORY", "Inventorystorage: Attempting to load " + FileName); Assembly pluginAssembly = Assembly.LoadFrom(FileName); foreach (Type pluginType in pluginAssembly.GetTypes()) @@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); plug.Initialise(); m_plugins.Add(plug.getName(), plug); - MainLog.Instance.Verbose("INVENTORY", "Added IInventoryData Interface"); + MainLog.Instance.Verbose("AGENTINVENTORY", "Added IInventoryData Interface"); } } } diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 58dab9b2af..6d4cb68b4e 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -277,6 +277,7 @@ namespace OpenSim.Framework.UserManagement TempHash["type_default"] = -1; TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001"; temp.Add(TempHash); + return temp; } diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml index a8f3f11acd..8d93035850 100644 --- a/bin/OpenSimAssetSet.xml +++ b/bin/OpenSimAssetSet.xml @@ -13,41 +13,6 @@ -
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml index 0ec23c5b6b..d209635edb 100644 --- a/bin/OpenSimLibrary.xml +++ b/bin/OpenSimLibrary.xml @@ -539,4 +539,65 @@
- \ No newline at end of file +
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+ +