From a04560cf0cb9d2fe3f930122caf560d860527ec8 Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Mon, 5 Jan 2009 19:59:29 +0000 Subject: Added viewer's default terrain textures. This fixes Mantis #2947. Thanks jhurliman --- ThirdPartyLicenses/DefaultTerrain.txt | 23 +++++++++ ...rt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture | Bin 0 -> 6004 bytes ...ss-abb783e6-3e93-26c0-248a-247666855da3.texture | Bin 0 -> 6139 bytes ...in-179cdabd-398a-9b6b-1391-4dc333ba321f.texture | Bin 0 -> 6077 bytes ...ck-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture | Bin 0 -> 6140 bytes bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 25 ++++++++++ .../TexturesLibrary/TexturesLibraryItems.xml | 53 +++++++++++++++++++++ 7 files changed, 101 insertions(+) create mode 100644 ThirdPartyLicenses/DefaultTerrain.txt create mode 100644 bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture create mode 100644 bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture create mode 100644 bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture create mode 100644 bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture 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 @@ + COPYRIGHT AND PERMISSION NOTICE + +Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. + +Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer +artwork and other works in the files distributed with this Notice under +the Creative Commons Attribution-Share Alike 3.0 License, available at +http://creativecommons.org/licenses/by-sa/3.0/legalcode. [^] For the license +summary, see http://creativecommons.org/licenses/by-sa/3.0/. + +Notwithstanding the foregoing, all of Linden Lab's trademarks, including +but not limited to the Second Life brand name and Second Life Eye-in-Hand +logo, are subject to our trademark policy at +http://secondlife.com/corporate/trademark/. + +If you distribute any copies or adaptations of the Second Life viewer +artwork or any other works in these files, you must include this Notice +and clearly identify any changes made to the original works. Include +this Notice and information where copyright notices are usually included, +for example, after your own copyright notice acknowledging your use of +the Second Life viewer artwork, in a text file distributed with your +program, in your application's About window, or on a credits page for +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 Binary files /dev/null and b/bin/assets/TexturesAssetSet/Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture 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 Binary files /dev/null and b/bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture 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 Binary files /dev/null and b/bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture 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 Binary files /dev/null and b/bin/assets/TexturesAssetSet/Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture 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 @@ + +
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
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 @@ + +
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +
-- cgit v1.1