diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-18 06:15:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-18 06:15:12 -0500 |
| commit | 17f79c802023d3b220986321f51757b102b70e81 (patch) | |
| tree | 93fd855bf772d1f0deac96a504323a707c112ea7 /indra/viewer_components | |
| parent | d0b4c4a7b2c454d1a287af4a3a7b7342609d555d (diff) | |
| parent | c89e281de1420254f8028f4dff907cf1ae985d7a (diff) | |
merge changes for viewer-vs2010
Diffstat (limited to 'indra/viewer_components')
| -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) |