summaryrefslogtreecommitdiff
path: root/indra/cmake/Variables.cmake
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
committerOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
commit4d22c32aa9ac42b4a720200386d68339e8656974 (patch)
treec84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/cmake/Variables.cmake
parent73e6711268adb93025386ffb766055125f0d849e (diff)
parent33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff)
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/cmake/Variables.cmake')
-rwxr-xr-x[-rw-r--r--]indra/cmake/Variables.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 6ec621632b..7c310ba9c3 100644..100755
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -170,8 +170,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Default deploy grid
set(GRID agni CACHE STRING "Target Grid")
-set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name")
-set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
+set(VIEWER_CHANNEL "Second Life Test" CACHE STRING "Viewer Channel Name")
if (XCODE_VERSION GREATER 4.2)
set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")