diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-21 10:36:29 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-21 10:36:29 -0500 |
| commit | 38f4bad925214d848eccd2b5e32123afeb68984d (patch) | |
| tree | a1a21acac904ebfc5e80db226ab587af2d6558f7 /indra/viewer_components/updater | |
| parent | eac9c45cdad9c96e621f5c84ce51062f40c09511 (diff) | |
| parent | bb3be2c07f492577254ae9ace5675eb92d10f061 (diff) | |
Automated merge up from viewer-development
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, |