diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
| commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
| tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/viewer_components/updater/llupdaterservice.cpp | |
| parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
| parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) | |
merge changes for storm-937
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) |