aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-27 15:17:22 +0000
committerJustin Clarke Casey2007-12-27 15:17:22 +0000
commit997a2907e2e26d6ee09c4e222bfbc017e3229418 (patch)
treeab5e407a94d1876436cec308a9958497b9120380 /OpenSim/Framework/Communications/Cache
parent* AssetServerBase: _ProcessRequest is now called GetAsset (diff)
downloadopensim-SC-997a2907e2e26d6ee09c4e222bfbc017e3229418.zip
opensim-SC-997a2907e2e26d6ee09c4e222bfbc017e3229418.tar.gz
opensim-SC-997a2907e2e26d6ee09c4e222bfbc017e3229418.tar.bz2
opensim-SC-997a2907e2e26d6ee09c4e222bfbc017e3229418.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs17
1 files changed, 1 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index ffc94bf..4c8eddf 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -81,22 +81,7 @@ namespace OpenSim.Framework.Communications.Cache
81 81
82 private void CreateLibraryItems() 82 private void CreateLibraryItems()
83 { 83 {
84 InventoryItemBase item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000002"), "Plywood", "Plywood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); 84 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);
85 m_textureFolder.Items.Add(item.inventoryID, item);
86
87 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000003"), "Rocks", "Rocks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
88 m_textureFolder.Items.Add(item.inventoryID, item);
89
90 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000001"), "Bricks", "Bricks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
91 m_textureFolder.Items.Add(item.inventoryID, item);
92
93 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000004"), "Granite", "Granite texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
94 m_textureFolder.Items.Add(item.inventoryID, item);
95
96 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000005"), "Hardwood", "Hardwood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
97 m_textureFolder.Items.Add(item.inventoryID, item);
98
99 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);
100 item.inventoryCurrentPermissions = 0; 85 item.inventoryCurrentPermissions = 0;
101 item.inventoryNextPermissions = 0; 86 item.inventoryNextPermissions = 0;
102 Items.Add(item.inventoryID, item); 87 Items.Add(item.inventoryID, item);