diff options
| author | Don Kjer <don@lindenlab.com> | 2011-04-20 18:12:32 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-04-20 18:12:32 +0000 |
| commit | da3c0658de4b6e7ab645b718927e9b10fd612b01 (patch) | |
| tree | 26c4faeb3f0818e4bbacf5579e3360f9790b2335 /indra | |
| parent | ee2cea657ad54643f19f1ced42deecd628a59e1b (diff) | |
| parent | 76f24589cd7168099cbffee358835e5489c961cf (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Variables.cmake | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 77dd34d122..8c9c375790 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") +set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) set(SERVER ON CACHE BOOL "Build Second Life server software.") diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bd6df962a1..df5afcbf1c 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |