diff options
author | Teravus Ovares | 2007-12-28 05:36:28 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-28 05:36:28 +0000 |
commit | 5bd5770ed2a5c2087a75489ed512ea59f7f25a1a (patch) | |
tree | e0041517433d012b22edac4cc76f145c01ba157b /bin/OpenSimAssetSet.xml | |
parent | * Added ability to create new prim on existing prim (rezzing prim from invent... (diff) | |
download | opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.zip opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.gz opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.bz2 opensim-SC-5bd5770ed2a5c2087a75489ed512ea59f7f25a1a.tar.xz |
* Patch from Melanie. Thanks Melanie!
* This patch addresses a regression where 5 default textures, including the default "new prim" texture, would not be shown unless in viewer cache.
* Further, it supplies a new plywood texture as the base texture, which is purpose-made from locally photo-sourced material (means i took a picture and made it into a tile), which is closer in appearance and color to the Linden one.
* It changes the default new prim texture UUID to match the UUID generated by the viewer when "default" is clicked, which is a texture UUID hardcoded in some scripts as well, so it would cause compatibility issues if not addressed.
* The patch fixes a number of UUID duplications (same UUID for asset and inventory items) and capitalization issues in the XML files.
* It also includes new versions of 4 other textures, which were no longer loadable in grid mode.
Diffstat (limited to 'bin/OpenSimAssetSet.xml')
-rw-r--r-- | bin/OpenSimAssetSet.xml | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml index 8d93035..21e298a 100644 --- a/bin/OpenSimAssetSet.xml +++ b/bin/OpenSimAssetSet.xml | |||
@@ -335,49 +335,41 @@ | |||
335 | <Key Name="inventoryType" Value="0" /> | 335 | <Key Name="inventoryType" Value="0" /> |
336 | <Key Name="fileName" Value="peaches.jp2" /> | 336 | <Key Name="fileName" Value="peaches.jp2" /> |
337 | </Section> | 337 | </Section> |
338 | <!-- Copied from hardcoded values --> | 338 | <Section Name="bricks"> |
339 | <Section Name="Bricks"> | ||
340 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> | 339 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> |
341 | <Key Name="name" Value="Bricks"/> | 340 | <Key Name="name" Value="bricks"/> |
342 | <Key Name="assetType" Value="0" /> | 341 | <Key Name="assetType" Value="0" /> |
343 | <Key Name="inventoryType" Value="0" /> | 342 | <Key Name="inventoryType" Value="0" /> |
344 | <Key Name="fileName" Value="bricks.jp2"/> | 343 | <Key Name="fileName" Value="bricks.jp2"/> |
345 | </Section> | 344 | </Section> |
346 | <Section Name="Plywood"> | 345 | <Section Name="plywood"> |
347 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/> | 346 | <Key Name="assetID" Value="89556747-24cb-43ed-920b-47caed15465f"/> |
348 | <Key Name="name" Value="Plywood"/> | 347 | <Key Name="name" Value="plywood"/> |
349 | <Key Name="assetType" Value="0" /> | 348 | <Key Name="assetType" Value="0" /> |
350 | <Key Name="inventoryType" Value="0" /> | 349 | <Key Name="inventoryType" Value="0" /> |
351 | <Key Name="fileName" Value="plywood.jp2"/> | 350 | <Key Name="fileName" Value="plywood.jp2"/> |
352 | </Section> | 351 | </Section> |
353 | <Section Name="Rocks"> | 352 | <Section Name="rocks"> |
354 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/> | 353 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/> |
355 | <Key Name="name" Value="Rocks"/> | 354 | <Key Name="name" Value="rocks"/> |
356 | <Key Name="assetType" Value="0" /> | 355 | <Key Name="assetType" Value="0" /> |
357 | <Key Name="inventoryType" Value="0" /> | 356 | <Key Name="inventoryType" Value="0" /> |
358 | <Key Name="fileName" Value="rocks.jp2"/> | 357 | <Key Name="fileName" Value="rocks.jp2"/> |
359 | </Section> | 358 | </Section> |
360 | <Section Name="Granite"> | 359 | <Section Name="granite"> |
361 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/> | 360 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/> |
362 | <Key Name="name" Value="Granite"/> | 361 | <Key Name="name" Value="granite"/> |
363 | <Key Name="assetType" Value="0" /> | 362 | <Key Name="assetType" Value="0" /> |
364 | <Key Name="inventoryType" Value="0" /> | 363 | <Key Name="inventoryType" Value="0" /> |
365 | <Key Name="fileName" Value="granite.jp2"/> | 364 | <Key Name="fileName" Value="granite.jp2"/> |
366 | </Section> | 365 | </Section> |
367 | <Section Name="Hardwood"> | 366 | <Section Name="hardwood"> |
368 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/> | 367 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/> |
369 | <Key Name="name" Value="Hardwood"/> | 368 | <Key Name="name" Value="hardwood"/> |
370 | <Key Name="assetType" Value="0" /> | 369 | <Key Name="assetType" Value="0" /> |
371 | <Key Name="inventoryType" Value="0" /> | 370 | <Key Name="inventoryType" Value="0" /> |
372 | <Key Name="fileName" Value="hardwood.jp2"/> | 371 | <Key Name="fileName" Value="hardwood.jp2"/> |
373 | </Section> | 372 | </Section> |
374 | <Section Name="Prim Base Texture"> | ||
375 | <Key Name="assetID" Value="00000000-0000-1111-5005-000000000005"/> | ||
376 | <Key Name="name" Value="Prim Base Texture"/> | ||
377 | <Key Name="assetType" Value="0" /> | ||
378 | <Key Name="inventoryType" Value="0" /> | ||
379 | <Key Name="fileName" Value="plywood.jp2"/> | ||
380 | </Section> | ||
381 | <Section Name="Map Base Texture"> | 373 | <Section Name="Map Base Texture"> |
382 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/> | 374 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/> |
383 | <Key Name="name" Value="Map Base Texture"/> | 375 | <Key Name="name" Value="Map Base Texture"/> |