aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-30 16:42:12 -0700
committerJacek Antonelli2009-12-06 16:32:49 -0600
commit6e25f129ca0f0d06eed0024a2e39acf6d19cc004 (patch)
tree18dff69f1d1501d0df76e5853c5fccd66c9d9eef /linden/indra
parentRemoved VS2003 boost references from CMake (diff)
downloadmeta-impy-6e25f129ca0f0d06eed0024a2e39acf6d19cc004.zip
meta-impy-6e25f129ca0f0d06eed0024a2e39acf6d19cc004.tar.gz
meta-impy-6e25f129ca0f0d06eed0024a2e39acf6d19cc004.tar.bz2
meta-impy-6e25f129ca0f0d06eed0024a2e39acf6d19cc004.tar.xz
Added Imprudence viewer artwork to install.xml
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/cmake/00-Common.cmake5
-rw-r--r--linden/indra/newview/CMakeLists.txt3
-rw-r--r--linden/indra/newview/res-sdl/imprudence_icon.BMPbin4662 -> 0 bytes
-rw-r--r--linden/indra/newview/res/imp_icon.icobin533678 -> 0 bytes
-rw-r--r--linden/indra/newview/res/imprudence_icon.pngbin32529 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.pngbin10714 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/arrow_left.tgabin510 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/arrow_right.tgabin510 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/map_avatar_32.tgabin2894 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/map_avatar_above_32.tgabin2909 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/map_avatar_below_32.tgabin3037 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/map_avatar_you_32.tgabin3395 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/silver/textures/arrow_left.tgabin424 -> 0 bytes
-rw-r--r--linden/indra/newview/skins/silver/textures/arrow_right.tgabin424 -> 0 bytes
14 files changed, 6 insertions, 2 deletions
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 @@
3# Compilation options shared by all Second Life components. 3# Compilation options shared by all Second Life components.
4 4
5include(Variables) 5include(Variables)
6include(Prebuilt)
7
8# Download viewer artwork
9
10 use_prebuilt_binary(artwork)
6 11
7 12
8# Portable compilation flags. 13# 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)
976 res/arrowcopmulti.cur 976 res/arrowcopmulti.cur
977 res/arrowdrag.cur 977 res/arrowdrag.cur
978 res/circleandline.cur 978 res/circleandline.cur
979 res/icon1.ico 979 res/imp_icon.ico
980 res/imprudence_icon.png 980 res/imprudence_icon.png
981 res/llarrow.cur 981 res/llarrow.cur
982 res/llarrowdrag.cur 982 res/llarrowdrag.cur
@@ -997,7 +997,6 @@ if (WINDOWS)
997 res/lltooltranslate.cur 997 res/lltooltranslate.cur
998 res/lltoolzoomin.cur 998 res/lltoolzoomin.cur
999 res/lltoolzoomout.cur 999 res/lltoolzoomout.cur
1000 res/ll_icon.ico
1001 res/resource.h 1000 res/resource.h
1002 res/toolbuy.cur 1001 res/toolbuy.cur
1003 res/toolopen.cur 1002 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
--- a/linden/indra/newview/res-sdl/imprudence_icon.BMP
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/res/imp_icon.ico
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/res/imprudence_icon.png
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/arrow_left.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/arrow_right.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/map_avatar_32.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/silver/textures/arrow_left.tga
+++ /dev/null
Binary files 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
--- a/linden/indra/newview/skins/silver/textures/arrow_right.tga
+++ /dev/null
Binary files differ