diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 10:54:08 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 10:54:08 -0800 |
| commit | 14042f631de03b0b6730fb8fdb89e7abc8202f4a (patch) | |
| tree | bbe40d0746259b955af7c4183bad4288934af523 /indra/viewer_components/updater | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
fix CHOP-369: catch case of synchronous download failure.
Diffstat (limited to 'indra/viewer_components/updater')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index ea242f45cd..20534fdf3a 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -375,7 +375,11 @@ void LLUpdaterServiceImpl::optionalUpdate(std::string const & newVersion, mIsDownloading = true; mUpdateDownloader.download(uri, hash, newVersion, false); - setState(LLUpdaterService::DOWNLOADING); + if(getState() != LLUpdaterService::FAILURE) { + setState(LLUpdaterService::DOWNLOADING); + } else { + ; // Download failed snynchronously; we are done. + } } void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, @@ -387,7 +391,11 @@ void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, mIsDownloading = true; mUpdateDownloader.download(uri, hash, newVersion, true); - setState(LLUpdaterService::DOWNLOADING); + if(getState() != LLUpdaterService::FAILURE) { + setState(LLUpdaterService::DOWNLOADING); + } else { + ; // Download failed snynchronously; we are done. + } } void LLUpdaterServiceImpl::upToDate(void) |