summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/llupdatedownloader.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-11-18 21:57:27 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2010-11-18 21:57:27 -0800
commit8c2026d6b71f133deafa6b0e19baf69632a2510a (patch)
tree580083310e6298a8b68aba59a566d18a970d6fbb /indra/viewer_components/updater/llupdatedownloader.cpp
parente19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (diff)
CHOP-135 Bug fixes.
Diffstat (limited to 'indra/viewer_components/updater/llupdatedownloader.cpp')
-rw-r--r--indra/viewer_components/updater/llupdatedownloader.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp
index 4820f1f452..c17a50e242 100644
--- a/indra/viewer_components/updater/llupdatedownloader.cpp
+++ b/indra/viewer_components/updater/llupdatedownloader.cpp
@@ -204,7 +204,11 @@ bool LLUpdateDownloader::Implementation::isDownloading(void)
void LLUpdateDownloader::Implementation::resume(void)
{
- if(isDownloading()) mClient.downloadError("download in progress");
+ mCancelled = false;
+
+ if(isDownloading()) {
+ mClient.downloadError("download in progress");
+ }
mDownloadRecordPath = downloadMarkerPath();
llifstream dataStream(mDownloadRecordPath);