diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 14:58:10 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 14:58:10 -0800 |
| commit | 9fa947ef741f6e63be1994e83fcf8f182e7eebed (patch) | |
| tree | 62517bd04773696c6fc80a03ce8b26caaa3a20ff | |
| parent | 14042f631de03b0b6730fb8fdb89e7abc8202f4a (diff) | |
a less brain dead fix for CHOP-369
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 20534fdf3a..1888f191e2 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -373,13 +373,8 @@ void LLUpdaterServiceImpl::optionalUpdate(std::string const & newVersion, stopTimer(); mNewVersion = newVersion; mIsDownloading = true; + setState(LLUpdaterService::DOWNLOADING); mUpdateDownloader.download(uri, hash, newVersion, false); - - if(getState() != LLUpdaterService::FAILURE) { - setState(LLUpdaterService::DOWNLOADING); - } else { - ; // Download failed snynchronously; we are done. - } } void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, @@ -389,13 +384,8 @@ void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, stopTimer(); mNewVersion = newVersion; mIsDownloading = true; + setState(LLUpdaterService::DOWNLOADING); mUpdateDownloader.download(uri, hash, newVersion, true); - - if(getState() != LLUpdaterService::FAILURE) { - setState(LLUpdaterService::DOWNLOADING); - } else { - ; // Download failed snynchronously; we are done. - } } void LLUpdaterServiceImpl::upToDate(void) |