diff options
author | Homer Horwitz | 2009-01-05 19:59:29 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-01-05 19:59:29 +0000 |
commit | a04560cf0cb9d2fe3f930122caf560d860527ec8 (patch) | |
tree | f228fe598de49fc45d35eb06fcfc402af4df2c86 | |
parent | * Centralize references to the well known blank texture 5748decc-f629-461c-9a... (diff) | |
download | opensim-SC-a04560cf0cb9d2fe3f930122caf560d860527ec8.zip opensim-SC-a04560cf0cb9d2fe3f930122caf560d860527ec8.tar.gz opensim-SC-a04560cf0cb9d2fe3f930122caf560d860527ec8.tar.bz2 opensim-SC-a04560cf0cb9d2fe3f930122caf560d860527ec8.tar.xz |
Added viewer's default terrain textures.
This fixes Mantis #2947. Thanks jhurliman
-rw-r--r-- | ThirdPartyLicenses/DefaultTerrain.txt | 23 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture | bin | 0 -> 6004 bytes | |||
-rw-r--r-- | bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture | bin | 0 -> 6139 bytes | |||
-rw-r--r-- | bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture | bin | 0 -> 6077 bytes | |||
-rw-r--r-- | bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture | bin | 0 -> 6140 bytes | |||
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 25 | ||||
-rw-r--r-- | bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | 53 |
7 files changed, 101 insertions, 0 deletions
diff --git a/ThirdPartyLicenses/DefaultTerrain.txt b/ThirdPartyLicenses/DefaultTerrain.txt new file mode 100644 index 0000000..112beff --- /dev/null +++ b/ThirdPartyLicenses/DefaultTerrain.txt | |||
@@ -0,0 +1,23 @@ | |||
1 | COPYRIGHT AND PERMISSION NOTICE | ||
2 | |||
3 | Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. | ||
4 | |||
5 | Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer | ||
6 | artwork and other works in the files distributed with this Notice under | ||
7 | the Creative Commons Attribution-Share Alike 3.0 License, available at | ||
8 | http://creativecommons.org/licenses/by-sa/3.0/legalcode. [^] For the license | ||
9 | summary, see http://creativecommons.org/licenses/by-sa/3.0/. | ||
10 | |||
11 | Notwithstanding the foregoing, all of Linden Lab's trademarks, including | ||
12 | but not limited to the Second Life brand name and Second Life Eye-in-Hand | ||
13 | logo, are subject to our trademark policy at | ||
14 | http://secondlife.com/corporate/trademark/. | ||
15 | |||
16 | If you distribute any copies or adaptations of the Second Life viewer | ||
17 | artwork or any other works in these files, you must include this Notice | ||
18 | and clearly identify any changes made to the original works. Include | ||
19 | this Notice and information where copyright notices are usually included, | ||
20 | for example, after your own copyright notice acknowledging your use of | ||
21 | the Second Life viewer artwork, in a text file distributed with your | ||
22 | program, in your application's About window, or on a credits page for | ||
23 | your work. | ||
diff --git a/bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture b/bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture new file mode 100644 index 0000000..44f31a0 --- /dev/null +++ b/bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture | |||
Binary files differ | |||
diff --git a/bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture b/bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture new file mode 100644 index 0000000..13c43b4 --- /dev/null +++ b/bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture | |||
Binary files differ | |||
diff --git a/bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture b/bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture new file mode 100644 index 0000000..8971ac3 --- /dev/null +++ b/bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture | |||
Binary files differ | |||
diff --git a/bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture b/bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture new file mode 100644 index 0000000..ccbeb08 --- /dev/null +++ b/bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture | |||
Binary files differ | |||
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index c036d12..6235f48 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
@@ -355,4 +355,29 @@ | |||
355 | <Key Name="assetType" Value="0" /> | 355 | <Key Name="assetType" Value="0" /> |
356 | <Key Name="fileName" Value="cloud.jp2"/> | 356 | <Key Name="fileName" Value="cloud.jp2"/> |
357 | </Section> | 357 | </Section> |
358 | |||
359 | <Section Name="Terrain Dirt"> | ||
360 | <Key Name="assetID" Value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/> | ||
361 | <Key Name="name" Value="Terrain Dirt"/> | ||
362 | <Key Name="assetType" Value="0" /> | ||
363 | <Key Name="fileName" Value="Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture" /> | ||
364 | </Section> | ||
365 | <Section Name="Terrain Grass"> | ||
366 | <Key Name="assetID" Value="abb783e6-3e93-26c0-248a-247666855da3"/> | ||
367 | <Key Name="name" Value="Terrain Grass"/> | ||
368 | <Key Name="assetType" Value="0" /> | ||
369 | <Key Name="fileName" Value="Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture" /> | ||
370 | </Section> | ||
371 | <Section Name="Terrain Mountain"> | ||
372 | <Key Name="assetID" Value="179cdabd-398a-9b6b-1391-4dc333ba321f"/> | ||
373 | <Key Name="name" Value="Terrain Mountain"/> | ||
374 | <Key Name="assetType" Value="0" /> | ||
375 | <Key Name="fileName" Value="Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture" /> | ||
376 | </Section> | ||
377 | <Section Name="Terrain Rock"> | ||
378 | <Key Name="assetID" Value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/> | ||
379 | <Key Name="name" Value="Terrain Rock"/> | ||
380 | <Key Name="assetType" Value="0" /> | ||
381 | <Key Name="fileName" Value="Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture" /> | ||
382 | </Section> | ||
358 | </Nini> | 383 | </Nini> |
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index 56b424a..30af8fa 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | |||
@@ -653,4 +653,57 @@ | |||
653 | <Key Name="everyonePermissions" Value="2147483647" /> | 653 | <Key Name="everyonePermissions" Value="2147483647" /> |
654 | <Key Name="basePermissions" Value="2147483647" /> | 654 | <Key Name="basePermissions" Value="2147483647" /> |
655 | </Section> | 655 | </Section> |
656 | |||
657 | <Section Name="Terrain Dirt"> | ||
658 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000006"/> | ||
659 | <Key Name="assetID" Value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/> | ||
660 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | ||
661 | <Key Name="description" Value="" /> | ||
662 | <Key Name="name" Value="Terrain Dirt" /> | ||
663 | <Key Name="assetType" Value="0" /> | ||
664 | <Key Name="inventoryType" Value="0" /> | ||
665 | <Key Name="currentPermissions" Value="2147483647" /> | ||
666 | <Key Name="nextPermissions" Value="2147483647" /> | ||
667 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
668 | <Key Name="basePermissions" Value="2147483647" /> | ||
669 | </Section> | ||
670 | <Section Name="Terrain Grass"> | ||
671 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000007"/> | ||
672 | <Key Name="assetID" Value="abb783e6-3e93-26c0-248a-247666855da3"/> | ||
673 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | ||
674 | <Key Name="description" Value="" /> | ||
675 | <Key Name="name" Value="Terrain Grass" /> | ||
676 | <Key Name="assetType" Value="0" /> | ||
677 | <Key Name="inventoryType" Value="0" /> | ||
678 | <Key Name="currentPermissions" Value="2147483647" /> | ||
679 | <Key Name="nextPermissions" Value="2147483647" /> | ||
680 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
681 | <Key Name="basePermissions" Value="2147483647" /> | ||
682 | </Section> | ||
683 | <Section Name="Terrain Mountain"> | ||
684 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000008"/> | ||
685 | <Key Name="assetID" Value="179cdabd-398a-9b6b-1391-4dc333ba321f"/> | ||
686 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | ||
687 | <Key Name="description" Value="" /> | ||
688 | <Key Name="name" Value="Terrain Mountain" /> | ||
689 | <Key Name="assetType" Value="0" /> | ||
690 | <Key Name="inventoryType" Value="0" /> | ||
691 | <Key Name="currentPermissions" Value="2147483647" /> | ||
692 | <Key Name="nextPermissions" Value="2147483647" /> | ||
693 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
694 | <Key Name="basePermissions" Value="2147483647" /> | ||
695 | </Section> | ||
696 | <Section Name="Terrain Rock"> | ||
697 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000009"/> | ||
698 | <Key Name="assetID" Value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/> | ||
699 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | ||
700 | <Key Name="description" Value="" /> | ||
701 | <Key Name="name" Value="Terrain Rock" /> | ||
702 | <Key Name="assetType" Value="0" /> | ||
703 | <Key Name="inventoryType" Value="0" /> | ||
704 | <Key Name="currentPermissions" Value="2147483647" /> | ||
705 | <Key Name="nextPermissions" Value="2147483647" /> | ||
706 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
707 | <Key Name="basePermissions" Value="2147483647" /> | ||
708 | </Section> | ||
656 | </Nini> | 709 | </Nini> |