diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:46:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:46:39 -0500 |
| commit | 92eadc18f3ea3538c36518f7060b4b78a80bc0d7 (patch) | |
| tree | 9ddade013f00609a1c47614d6fbd6637a5af480c /indra/viewer_components | |
| parent | 4f801f729dbaf65edba93a7152c6f21ba2269ee0 (diff) | |
| parent | 3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff) | |
merge changes for storm-373
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, |