diff options
| author | callum <none@none> | 2011-01-28 11:20:36 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-01-28 11:20:36 -0800 |
| commit | b46281211a8f8774f307980216142805ea8b0a3b (patch) | |
| tree | 21a7b416af038813cd393af8ab9e3a80475b72ed /indra/viewer_components | |
| parent | ac7d7fea8288b1d6f5dec65f9dee5053d097fff5 (diff) | |
| parent | 7b7e9b0d0bd9c35acb346ae359f9a08a48b248a2 (diff) | |
Merge
Diffstat (limited to 'indra/viewer_components')
| -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, |