livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a less brain dead fix for CHOP-369

master
Andrew A. de Laix 2011-01-24 14:58:10 -08:00
parent 14042f631d
commit 9fa947ef74
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/viewer_components/updater/llupdaterservice.cpp
View File

@ -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)