OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
afrisby
Justin Clarke Casey 2007-12-27 15:17:22 +00:00
parent 87e2a694e2
commit 997a2907e2
5 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -81,22 +81,7 @@ namespace OpenSim.Framework.Communications.Cache
private void CreateLibraryItems() 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); 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);
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);
item.inventoryCurrentPermissions = 0; item.inventoryCurrentPermissions = 0;
item.inventoryNextPermissions = 0; item.inventoryNextPermissions = 0;
Items.Add(item.inventoryID, item); Items.Add(item.inventoryID, item);

4
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
{ {
if (!String.IsNullOrEmpty(FileName)) 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); Assembly pluginAssembly = Assembly.LoadFrom(FileName);
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())
@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications
(IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise(); plug.Initialise();
m_plugins.Add(plug.getName(), plug); m_plugins.Add(plug.getName(), plug);
MainLog.Instance.Verbose("INVENTORY", "Added IInventoryData Interface"); MainLog.Instance.Verbose("AGENTINVENTORY", "Added IInventoryData Interface");
} }
} }
} }

1
OpenSim/Framework/Communications/LoginService.cs
View File

@ -277,6 +277,7 @@ namespace OpenSim.Framework.UserManagement
TempHash["type_default"] = -1; TempHash["type_default"] = -1;
TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001"; TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001";
temp.Add(TempHash); temp.Add(TempHash);
return temp; return temp;
} }

35
bin/OpenSimAssetSet.xml
View File

@ -13,41 +13,6 @@
<Key Name="inventoryType" Value="0" /> <Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="femaleface.jp2" /> <Key Name="fileName" Value="femaleface.jp2" />
</Section> </Section>
<Section Name="plywood Texture">
<Key Name="assetID" Value="00000000-0000-0000-9999-000000000002" />
<Key Name="name" Value="plywood" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="plywood.jp2" />
</Section>
<Section Name="rocks Texture">
<Key Name="assetID" Value="00000000-0000-0000-9999-000000000003" />
<Key Name="name" Value="rocks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="rocks.jp2" />
</Section>
<Section Name="bricks Texture">
<Key Name="assetID" Value="00000000-0000-0000-9999-000000000001" />
<Key Name="name" Value="bricks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="bricks.jp2" />
</Section>
<Section Name="granite Texture">
<Key Name="assetID" Value="00000000-0000-0000-9999-000000000004" />
<Key Name="name" Value="granite" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="granite.jp2" />
</Section>
<Section Name="hardwood Texture">
<Key Name="assetID" Value="00000000-0000-0000-9999-000000000005" />
<Key Name="name" Value="hardwood" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="hardwood.jp2" />
</Section>
<Section Name="4-tile2 Texture"> <Section Name="4-tile2 Texture">
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" /> <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" />
<Key Name="name" Value="4-tile2" /> <Key Name="name" Value="4-tile2" />

61
bin/OpenSimLibrary.xml
View File

@ -539,4 +539,65 @@
<Key Name="everyonePermissions" Value="2147483647" /> <Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" /> <Key Name="basePermissions" Value="2147483647" />
</Section> </Section>
<Section Name="bricks Texture">
<Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000001"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
<Key Name="description" Value="bricks texture" />
<Key Name="name" Value="bricks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="granite Texture">
<Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000004"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
<Key Name="description" Value="granite texture" />
<Key Name="name" Value="granite" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="hardwood Texture">
<Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000005"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
<Key Name="description" Value="hardwood texture" />
<Key Name="name" Value="hardwood" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="plywood Texture">
<Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000002"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
<Key Name="description" Value="plywood texture" />
<Key Name="name" Value="plywood" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rocks Texture">
<Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000003"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
<Key Name="description" Value="rocks texture" />
<Key Name="name" Value="rocks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
</Nini> </Nini>