From 44ad4f0ba10a998d0d210c7f4426c7b9a73c24ad Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 12 Feb 2013 16:38:59 -0500
Subject: [PATCH] set default viewer channel only in the cmake file

---
 indra/newview/llversioninfo.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
index a15b280fc00..35d0052bfaa 100644
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -29,16 +29,14 @@
 #include <sstream>
 #include "llversioninfo.h"
 
-#if ! defined(LL_VIEWER_VERSION_MAJOR) \
+#if ! defined(LL_VIEWER_CHANNEL)       \
+ || ! defined(LL_VIEWER_VERSION_MAJOR) \
  || ! defined(LL_VIEWER_VERSION_MINOR) \
  || ! defined(LL_VIEWER_VERSION_PATCH) \
  || ! defined(LL_VIEWER_VERSION_BUILD)
- #error "Version information is undefined"
+ #error "Channel or Version information is undefined"
 #endif
 
-#ifndef LL_VIEWER_CHANNEL
-#define LL_VIEWER_CHANNEL "Second Life Test"
-#endif
 const char * const LL_CHANNEL = LL_VIEWER_CHANNEL;
 
 //
-- 
GitLab