From 6e25f129ca0f0d06eed0024a2e39acf6d19cc004 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 30 Nov 2009 16:42:12 -0700 Subject: Added Imprudence viewer artwork to install.xml --- linden/indra/cmake/00-Common.cmake | 5 +++ linden/indra/newview/CMakeLists.txt | 3 +- linden/indra/newview/res-sdl/imprudence_icon.BMP | Bin 4662 -> 0 bytes linden/indra/newview/res/imp_icon.ico | Bin 533678 -> 0 bytes linden/indra/newview/res/imprudence_icon.png | Bin 32529 -> 0 bytes .../html/en-us/loading/imprudence_loading.png | Bin 10714 -> 0 bytes .../newview/skins/default/textures/arrow_left.tga | Bin 510 -> 0 bytes .../newview/skins/default/textures/arrow_right.tga | Bin 510 -> 0 bytes .../skins/default/textures/map_avatar_32.tga | Bin 2894 -> 0 bytes .../skins/default/textures/map_avatar_above_32.tga | Bin 2909 -> 0 bytes .../skins/default/textures/map_avatar_below_32.tga | Bin 3037 -> 0 bytes .../skins/default/textures/map_avatar_you_32.tga | Bin 3395 -> 0 bytes .../newview/skins/silver/textures/arrow_left.tga | Bin 424 -> 0 bytes .../newview/skins/silver/textures/arrow_right.tga | Bin 424 -> 0 bytes linden/install.xml | 38 +++++++++++++++++++++ 15 files changed, 44 insertions(+), 2 deletions(-) delete mode 100644 linden/indra/newview/res-sdl/imprudence_icon.BMP delete mode 100644 linden/indra/newview/res/imp_icon.ico delete mode 100644 linden/indra/newview/res/imprudence_icon.png delete mode 100644 linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png delete mode 100644 linden/indra/newview/skins/default/textures/arrow_left.tga delete mode 100644 linden/indra/newview/skins/default/textures/arrow_right.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_above_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_below_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_you_32.tga delete mode 100644 linden/indra/newview/skins/silver/textures/arrow_left.tga delete mode 100644 linden/indra/newview/skins/silver/textures/arrow_right.tga (limited to 'linden') diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 49fdb5b..1b5e9d2 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -3,6 +3,11 @@ # Compilation options shared by all Second Life components. include(Variables) +include(Prebuilt) + +# Download viewer artwork + + use_prebuilt_binary(artwork) # Portable compilation flags. diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 197857b..26c9b21 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -976,7 +976,7 @@ if (WINDOWS) res/arrowcopmulti.cur res/arrowdrag.cur res/circleandline.cur - res/icon1.ico + res/imp_icon.ico res/imprudence_icon.png res/llarrow.cur res/llarrowdrag.cur @@ -997,7 +997,6 @@ if (WINDOWS) res/lltooltranslate.cur res/lltoolzoomin.cur res/lltoolzoomout.cur - res/ll_icon.ico res/resource.h res/toolbuy.cur res/toolopen.cur diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP deleted file mode 100644 index c3f4887..0000000 Binary files a/linden/indra/newview/res-sdl/imprudence_icon.BMP and /dev/null differ diff --git a/linden/indra/newview/res/imp_icon.ico b/linden/indra/newview/res/imp_icon.ico deleted file mode 100644 index 3b1250a..0000000 Binary files a/linden/indra/newview/res/imp_icon.ico and /dev/null differ diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png deleted file mode 100644 index 8795fa7..0000000 Binary files a/linden/indra/newview/res/imprudence_icon.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png deleted file mode 100644 index f9ea7a2..0000000 Binary files a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga deleted file mode 100644 index 68e6280..0000000 Binary files a/linden/indra/newview/skins/default/textures/arrow_left.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga deleted file mode 100644 index 7a5a30e..0000000 Binary files a/linden/indra/newview/skins/default/textures/arrow_right.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga deleted file mode 100644 index aebeab4..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga deleted file mode 100644 index 65bd056..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga deleted file mode 100644 index 496c44b..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga deleted file mode 100644 index 782207e..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga deleted file mode 100644 index 43fbf12..0000000 Binary files a/linden/indra/newview/skins/silver/textures/arrow_left.tga and /dev/null differ diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga deleted file mode 100644 index a92ac9c..0000000 Binary files a/linden/indra/newview/skins/silver/textures/arrow_right.tga and /dev/null differ diff --git a/linden/install.xml b/linden/install.xml index 4f13d84..0b0dd4c 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -152,6 +152,39 @@ + artwork + + copyright + Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. With additions by the Imprudence team. + description + The artwork used in the client, such as UI textures and branding. + license + creative commons attribution-share alike 3.0 + packages + + darwin + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + linux + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + windows + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + + berkeley copyright @@ -1416,6 +1449,11 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn text http://daniel.haxx.se/projects/c-ares/license.html + creative commons attribution-share alike 3.0 + + url + http://creativecommons.org/licenses/by-sa/3.0/legalcode + curl url -- cgit v1.1