diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-14 12:59:42 -0800 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-14 12:59:42 -0800 |
commit | 8e4d6bb1acca21069b4038a2cdf56e18196d6cb2 (patch) | |
tree | 190ff4d2fc73974744453307e13db25520db6e4f /indra/viewer_components/updater | |
parent | c3fe256ef3e46393e41f20d7110083f1cb66436c (diff) |
fix CHOP-366, on temporary errors (e.g. version manager returns other than 200) show error dialog instructing the user to manually install the latest viewer.
Diffstat (limited to 'indra/viewer_components/updater')
-rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 1 | ||||
-rw-r--r-- | indra/viewer_components/updater/llupdaterservice.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index aa4983a3b6..ea242f45cd 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -361,6 +361,7 @@ void LLUpdaterServiceImpl::error(std::string const & message) { if(mIsChecking) { + setState(LLUpdaterService::TEMPORARY_ERROR); restartTimer(mCheckPeriod); } } diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h index 421481bc43..450f19c1c6 100644 --- a/indra/viewer_components/updater/llupdaterservice.h +++ b/indra/viewer_components/updater/llupdaterservice.h @@ -59,6 +59,7 @@ public: enum eUpdaterState { INITIAL, CHECKING_FOR_UPDATE, + TEMPORARY_ERROR, DOWNLOADING, INSTALLING, UP_TO_DATE, |