Added Imprudence viewer artwork to install.xml

16 files changed, 65 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4acad15..b7505be 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,24 @@
+2009-11-30 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added Imprudence viewer artwork to install.xml.
+        
+          deleted:    linden/indra/newview/res-sdl/imprudence_icon.BMP
+          deleted:    linden/indra/newview/res/imp_icon.ico
+          deleted:    linden/indra/newview/res/imprudence_icon.png
+          deleted:    linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
+          deleted:    linden/indra/newview/skins/default/textures/arrow_left.tga
+          deleted:    linden/indra/newview/skins/default/textures/arrow_right.tga
+          deleted:    linden/indra/newview/skins/default/textures/map_avatar_32.tga
+          deleted:    linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
+          deleted:    linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
+          deleted:    linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
+          deleted:    linden/indra/newview/skins/silver/textures/arrow_left.tga
+          deleted:    linden/indra/newview/skins/silver/textures/arrow_right.tga
+          modified:   linden/indra/cmake/00-Common.cmake
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/install.xml
+
+
 2009-11-29 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Removed VS2003 boost references from CMake.
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
--- a/linden/indra/newview/res-sdl/imprudence_icon.BMP
+++ /dev/null
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
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
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
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
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
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
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
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
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
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
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
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 @@
           </map>
         </map>
       </map>
+      <key>artwork</key>
+      <map>
+        <key>copyright</key>
+        <string>Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. With additions by the Imprudence team.</string>
+        <key>description</key>
+        <string>The artwork used in the client, such as UI textures and branding.</string>
+        <key>license</key>
+        <string>creative commons attribution-share alike 3.0</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>ad3f838d58338e5fce8e4770f67a04c5</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>ad3f838d58338e5fce8e4770f67a04c5</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>ad3f838d58338e5fce8e4770f67a04c5</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>berkeley</key>
       <map>
         <key>copyright</key>
@@ -1416,6 +1449,11 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
         <key>text</key>
         <string>http://daniel.haxx.se/projects/c-ares/license.html</string>
       </map>
+      <key>creative commons attribution-share alike 3.0</key>
+      <map>
+        <key>url</key>
+        <string>http://creativecommons.org/licenses/by-sa/3.0/legalcode</string>
+      </map>
       <key>curl</key>
       <map>
         <key>url</key>