diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
| commit | 2efe91ef64a963ef488d6018d04196753fe815ca (patch) | |
| tree | 09b198468fcc4b7a9405e68f355413aafde1d1b9 /indra/newview/llappviewer.cpp | |
| parent | dff79705eddd4ce92fbb3d8a3b3b47a734b4837b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
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 332c6eccba..e4f110b78f 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3090,8 +3090,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; |