diff options
author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/viewer_components/updater | |
parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
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) |