From 18b5636b74d80034867e2e8273706db4dc490b15 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 1 Dec 2009 08:14:11 -0700
Subject: Made downloading the artwork work while using the --standalone flag

---
 ChangeLog.txt                      | 6 ++++++
 linden/indra/cmake/00-Common.cmake | 9 +++++++--
 linden/indra/cmake/Variables.cmake | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b7505be..7a9ab99 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-11-30 McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* Made downloading the artwork work while using the --standalone flag.
+	
+	  modified:   linden/indra/cmake/00-Common.cmake
+	  modified:   linden/indra/cmake/Variables.cmake
+
+
 	* Added Imprudence viewer artwork to install.xml.
 	
 	  deleted:    linden/indra/newview/res-sdl/imprudence_icon.BMP
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1b5e9d2..746a3bf 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -5,10 +5,15 @@
 include(Variables)
 include(Prebuilt)
 
-# Download viewer artwork
+# Download viewer artwork even when using standalone
 
+if (STANDALONE)
+  set(STANDALONE OFF)
+    use_prebuilt_binary(artwork)
+  set(STANDALONE ON)
+else (STANDALONE)
   use_prebuilt_binary(artwork)
-
+endif (STANDALONE)
 
 # Portable compilation flags.
 
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 8f33a95..5d4dffe 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -82,7 +82,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
 set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
-set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
     set(SERVER ON CACHE BOOL "Build Second Life server software.")
-- 
cgit v1.1