aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
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 /bin
parent* AssetServerBase: _ProcessRequest is now called GetAsset (diff)
downloadopensim-SC_OLD-997a2907e2e26d6ee09c4e222bfbc017e3229418.zip
opensim-SC_OLD-997a2907e2e26d6ee09c4e222bfbc017e3229418.tar.gz
opensim-SC_OLD-997a2907e2e26d6ee09c4e222bfbc017e3229418.tar.bz2
opensim-SC_OLD-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 'bin')
-rw-r--r--bin/OpenSimAssetSet.xml35
-rw-r--r--bin/OpenSimLibrary.xml63
2 files changed, 62 insertions, 36 deletions
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml
index a8f3f11..8d93035 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -13,41 +13,6 @@
13 <Key Name="inventoryType" Value="0" /> 13 <Key Name="inventoryType" Value="0" />
14 <Key Name="fileName" Value="femaleface.jp2" /> 14 <Key Name="fileName" Value="femaleface.jp2" />
15 </Section> 15 </Section>
16 <Section Name="plywood Texture">
17 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000002" />
18 <Key Name="name" Value="plywood" />
19 <Key Name="assetType" Value="0" />
20 <Key Name="inventoryType" Value="0" />
21 <Key Name="fileName" Value="plywood.jp2" />
22 </Section>
23 <Section Name="rocks Texture">
24 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000003" />
25 <Key Name="name" Value="rocks" />
26 <Key Name="assetType" Value="0" />
27 <Key Name="inventoryType" Value="0" />
28 <Key Name="fileName" Value="rocks.jp2" />
29 </Section>
30 <Section Name="bricks Texture">
31 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000001" />
32 <Key Name="name" Value="bricks" />
33 <Key Name="assetType" Value="0" />
34 <Key Name="inventoryType" Value="0" />
35 <Key Name="fileName" Value="bricks.jp2" />
36 </Section>
37 <Section Name="granite Texture">
38 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000004" />
39 <Key Name="name" Value="granite" />
40 <Key Name="assetType" Value="0" />
41 <Key Name="inventoryType" Value="0" />
42 <Key Name="fileName" Value="granite.jp2" />
43 </Section>
44 <Section Name="hardwood Texture">
45 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000005" />
46 <Key Name="name" Value="hardwood" />
47 <Key Name="assetType" Value="0" />
48 <Key Name="inventoryType" Value="0" />
49 <Key Name="fileName" Value="hardwood.jp2" />
50 </Section>
51 <Section Name="4-tile2 Texture"> 16 <Section Name="4-tile2 Texture">
52 <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" /> 17 <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" />
53 <Key Name="name" Value="4-tile2" /> 18 <Key Name="name" Value="4-tile2" />
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml
index 0ec23c5..d209635 100644
--- a/bin/OpenSimLibrary.xml
+++ b/bin/OpenSimLibrary.xml
@@ -539,4 +539,65 @@
539 <Key Name="everyonePermissions" Value="2147483647" /> 539 <Key Name="everyonePermissions" Value="2147483647" />
540 <Key Name="basePermissions" Value="2147483647" /> 540 <Key Name="basePermissions" Value="2147483647" />
541 </Section> 541 </Section>
542</Nini> \ No newline at end of file 542 <Section Name="bricks Texture">
543 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000001"/>
544 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
545 <Key Name="description" Value="bricks texture" />
546 <Key Name="name" Value="bricks" />
547 <Key Name="assetType" Value="0" />
548 <Key Name="inventoryType" Value="0" />
549 <Key Name="currentPermissions" Value="2147483647" />
550 <Key Name="nextPermissions" Value="2147483647" />
551 <Key Name="everyonePermissions" Value="2147483647" />
552 <Key Name="basePermissions" Value="2147483647" />
553 </Section>
554 <Section Name="granite Texture">
555 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000004"/>
556 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
557 <Key Name="description" Value="granite texture" />
558 <Key Name="name" Value="granite" />
559 <Key Name="assetType" Value="0" />
560 <Key Name="inventoryType" Value="0" />
561 <Key Name="currentPermissions" Value="2147483647" />
562 <Key Name="nextPermissions" Value="2147483647" />
563 <Key Name="everyonePermissions" Value="2147483647" />
564 <Key Name="basePermissions" Value="2147483647" />
565 </Section>
566 <Section Name="hardwood Texture">
567 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000005"/>
568 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
569 <Key Name="description" Value="hardwood texture" />
570 <Key Name="name" Value="hardwood" />
571 <Key Name="assetType" Value="0" />
572 <Key Name="inventoryType" Value="0" />
573 <Key Name="currentPermissions" Value="2147483647" />
574 <Key Name="nextPermissions" Value="2147483647" />
575 <Key Name="everyonePermissions" Value="2147483647" />
576 <Key Name="basePermissions" Value="2147483647" />
577 </Section>
578 <Section Name="plywood Texture">
579 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000002"/>
580 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
581 <Key Name="description" Value="plywood texture" />
582 <Key Name="name" Value="plywood" />
583 <Key Name="assetType" Value="0" />
584 <Key Name="inventoryType" Value="0" />
585 <Key Name="currentPermissions" Value="2147483647" />
586 <Key Name="nextPermissions" Value="2147483647" />
587 <Key Name="everyonePermissions" Value="2147483647" />
588 <Key Name="basePermissions" Value="2147483647" />
589 </Section>
590 <Section Name="rocks Texture">
591 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000003"/>
592 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
593 <Key Name="description" Value="rocks texture" />
594 <Key Name="name" Value="rocks" />
595 <Key Name="assetType" Value="0" />
596 <Key Name="inventoryType" Value="0" />
597 <Key Name="currentPermissions" Value="2147483647" />
598 <Key Name="nextPermissions" Value="2147483647" />
599 <Key Name="everyonePermissions" Value="2147483647" />
600 <Key Name="basePermissions" Value="2147483647" />
601 </Section>
602
603</Nini>
generated by cgit v1.1 at 2024-11-04 21:47:32 +0000