diff options
| author | Kent Quirk <q@lindenlab.com> | 2011-01-31 19:29:18 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2011-01-31 19:29:18 -0500 |
| commit | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (patch) | |
| tree | 2d6ce1e7f503093327251126815da6a613ed9d23 /indra/viewer_components/updater | |
| parent | c62055043380147a760dc7f37ac0900df1a7f789 (diff) | |
| parent | 8e31ef838b1c9cc5880ea68d1c09e9137e0021bc (diff) | |
Merge
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) |