diff options
author | Armin Weatherwax | 2009-12-13 20:32:30 +0100 |
---|---|---|
committer | Armin Weatherwax | 2009-12-13 20:32:30 +0100 |
commit | 72cd31c80efd41d87ffc21141438cff66c806b3c (patch) | |
tree | c33e836871aac1db70633b92a8480b6774003b35 /linden/indra/cmake/Variables.cmake | |
parent | don't let the voice client spam about ParcelVoiceInfoRequest capability (SNOW... (diff) | |
parent | Added Imprudence VC80 .config files to the repo (diff) | |
download | meta-impy-72cd31c80efd41d87ffc21141438cff66c806b3c.zip meta-impy-72cd31c80efd41d87ffc21141438cff66c806b3c.tar.gz meta-impy-72cd31c80efd41d87ffc21141438cff66c806b3c.tar.bz2 meta-impy-72cd31c80efd41d87ffc21141438cff66c806b3c.tar.xz |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Diffstat (limited to 'linden/indra/cmake/Variables.cmake')
-rw-r--r-- | linden/indra/cmake/Variables.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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.") | |||
82 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") | 82 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") |
83 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") | 83 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") |
84 | 84 | ||
85 | set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") | 85 | set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") |
86 | 86 | ||
87 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) | 87 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) |
88 | set(SERVER ON CACHE BOOL "Build Second Life server software.") | 88 | set(SERVER ON CACHE BOOL "Build Second Life server software.") |