diff options
author | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
commit | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (patch) | |
tree | e51e47f79b78a076e821360763196cc72c154aad /indra/newview/llappviewer.cpp | |
parent | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (diff) | |
parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) |
Merge
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 a2aee2e000..9b9b591cd1 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3091,8 +3091,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; |