diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
| commit | ba1d1267fe2214198b36b5ed130a9a4ae5c5fb3f (patch) | |
| tree | 5e647d28eaeed51872ff9ca65536aeb2ce90535a /indra/viewer_components/updater | |
| parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
| parent | d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/viewer_components/updater')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index ea242f45cd..1888f191e2 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -373,9 +373,8 @@ void LLUpdaterServiceImpl::optionalUpdate(std::string const & newVersion, stopTimer(); mNewVersion = newVersion; mIsDownloading = true; - mUpdateDownloader.download(uri, hash, newVersion, false); - setState(LLUpdaterService::DOWNLOADING); + mUpdateDownloader.download(uri, hash, newVersion, false); } void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, @@ -385,9 +384,8 @@ void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion, stopTimer(); mNewVersion = newVersion; mIsDownloading = true; - mUpdateDownloader.download(uri, hash, newVersion, true); - setState(LLUpdaterService::DOWNLOADING); + mUpdateDownloader.download(uri, hash, newVersion, true); } void LLUpdaterServiceImpl::upToDate(void) |