From 63dec2a9b97776f5f7a2996b58bb446341458250 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 17 Dec 2010 14:26:55 -0800
Subject: [PATCH] Temporary workaround for CHOP-286: bandwidth limits freeze
the downloader thread on linux
---
indra/viewer_components/updater/llupdatedownloader.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp
index f259e06476d..85261a3252a 100644
--- a/indra/viewer_components/updater/llupdatedownloader.cpp
+++ b/indra/viewer_components/updater/llupdatedownloader.cpp
@@ -427,11 +427,13 @@ void LLUpdateDownloader::Implementation::initializeCurlGet(std::string const & u
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_PROGRESSFUNCTION, &progress_callback));
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_PROGRESSDATA, this));
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_NOPROGRESS, false));
+#if LL_WINDOWS || LL_DARWIN // temporary workaround for CHOP-286 (bandwidth limits freeze the downloader thread on linux)
if((mBandwidthLimit != 0) && !mDownloadData["required"].asBoolean()) {
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, mBandwidthLimit));
} else {
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, -1));
}
+#endif // LL_WINDOWS || LL_DARWIN
mDownloadPercent = 0;
}
--
GitLab