diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
commit | 627c28da811f00ddd02a5c2af0762f427ac02a1b (patch) | |
tree | 13e1deab87b9a3c56595b796bd17347e47a93658 /indra/viewer_components/updater/llupdaterservice.cpp | |
parent | f2764d24a3b3563d66a683c84af22b61648755cb (diff) | |
parent | 0929315ab103433275a71f26a4900ee0615932e9 (diff) |
Merge with viewer-headless
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
-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) |