diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-12 16:38:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 16:38:59 -0500 |
| commit | 44ad4f0ba10a998d0d210c7f4426c7b9a73c24ad (patch) | |
| tree | 38dd6c561e33bd443e0f8d97e4af749f7cc82f8c /indra | |
| parent | c8a588836aedd1d28556b3661c4b41c41d58c858 (diff) | |
set default viewer channel only in the cmake file
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llversioninfo.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index a15b280fc0..35d0052bfa 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; // |