diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-25 16:44:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-25 16:44:31 -0500 |
| commit | 13fe905b24546dda39a88466517aa0c6b449fbd8 (patch) | |
| tree | 9d24844a67c51ccbfdd0a720fc9fdf7b541567ce /indra | |
| parent | 7cc817846127d89da50f88fcc3cd1f38426b7155 (diff) | |
disable willing-to-test for Test viewers
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ae593daf08..6ec6f5489c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2938,7 +2938,17 @@ void LLAppViewer::initUpdater() std::string version = LLVersionInfo::getVersion(); std::string service_path = gSavedSettings.getString("UpdaterServicePath"); U32 check_period = gSavedSettings.getU32("UpdaterServiceCheckPeriod"); - bool willing_to_test = gSavedSettings.getBOOL("UpdaterWillingToTest"); + bool willing_to_test; + LL_DEBUGS("UpdaterService") << "channel " << channel << LL_ENDL; + if (channel.find("Test") != std::string::npos) // TBD - should be a regex + { + LL_INFOS("UpdaterService") << "Test build: overriding willing_to_test by sending testno" << LL_ENDL; + willing_to_test = false; + } + else + { + willing_to_test = gSavedSettings.getBOOL("UpdaterWillingToTest"); + } unsigned char unique_id[MD5HEX_STR_SIZE]; if ( ! llHashedUniqueID(unique_id) ) { |