diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
| commit | 790dfe7556a476b502ef3a0ea921efdd11735f28 (patch) | |
| tree | 3db004c2acdfcf32f01abbf284e6dbd67c61a4c8 /indra/viewer_components | |
| parent | 6a3d06deca73683514d4668f78adf684d760708c (diff) | |
| parent | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (diff) | |
merge changes for storm-844
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, |