diff options
| author | simon <none@none> | 2015-06-09 17:01:50 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-06-09 17:01:50 -0700 |
| commit | 3720ed06139d01acafd481ef12e00e6e55737b56 (patch) | |
| tree | 82c74e662e620cf185b6ea1dd530d58be851659e /indra/newview/llappviewer.cpp | |
| parent | ee4289ade5ea84f978cc71efcf1b3275650eb624 (diff) | |
| parent | 5fd8a51f149ba5f05af1e10585c3aee457dc0193 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5a5d2eb744..abbfe25fe2 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3092,8 +3092,8 @@ void LLAppViewer::initUpdater() U32 check_period = gSavedSettings.getU32("UpdaterServiceCheckPeriod"); bool willing_to_test; LL_DEBUGS("UpdaterService") << "channel " << channel << LL_ENDL; - static const boost::regex is_test_channel("\\bTest$"); - if (boost::regex_search(channel, is_test_channel)) + + if (LLVersionInfo::TEST_VIEWER == LLVersionInfo::getViewerMaturity()) { LL_INFOS("UpdaterService") << "Test build: overriding willing_to_test by sending testno" << LL_ENDL; willing_to_test = false; |