summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2008-08-13 21:12:58 +0000
committerChristian Goetze <cg@lindenlab.com>2008-08-13 21:12:58 +0000
commit63d6bb328408017e1fb3a834d7c1b3c8d87b0afa (patch)
treef62ffd828a01205f8adb95f176fa22d3c4cabdf4 /indra
parentb9b4a4d9347053a3834ca2928063136948f09d1d (diff)
Add caching of mysql database store, fixed problem with ignored VIEWER_LOGIN_CHANNEL, removed debug output from version manager addition code.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 699d13ea9b..e64cdfe2ea 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1342,7 +1342,7 @@ if (WINDOWS)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--configuration=${CMAKE_CFG_INTDIR}
--channel=${VIEWER_CHANNEL}
- --login_channel=${VIEWER_CHANNEL}
+ --login_channel=${VIEWER_LOGIN_CHANNEL}
--grid=${GRID}
--source=${CMAKE_CURRENT_SOURCE_DIR}
--artwork=${ARTWORK_DIR}
@@ -1417,7 +1417,7 @@ if (LINUX)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--grid=${GRID}
--channel=${VIEWER_CHANNEL}
- --login_channel=${VIEWER_CHANNEL}
+ --login_channel=${VIEWER_LOGIN_CHANNEL}
--installer_name=${product}
--arch=${ARCH}
--source=${CMAKE_CURRENT_SOURCE_DIR}
@@ -1473,7 +1473,7 @@ if (DARWIN)
--grid=${GRID}
--configuration=${CMAKE_CFG_INTDIR}
--channel=${VIEWER_CHANNEL}
- --login_channel=${VIEWER_CHANNEL}
+ --login_channel=${VIEWER_LOGIN_CHANNEL}
--source=${CMAKE_CURRENT_SOURCE_DIR}
--artwork=${ARTWORK_DIR}
--build=${CMAKE_CURRENT_BINARY_DIR}