Skip to content
Snippets Groups Projects
Commit 63dec2a9 authored by brad kittenbrink's avatar brad kittenbrink
Browse files

Temporary workaround for CHOP-286: bandwidth limits freeze the downloader thread on linux

parent 3c3c9a0d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/viewer_components/updater/llupdatedownloader.cpp
+ 2
− 0
View file @ 63dec2a9
...@@ -427,11 +427,13 @@ void LLUpdateDownloader::Implementation::initializeCurlGet(std::string const & u ...@@ -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_PROGRESSFUNCTION, &progress_callback));
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_PROGRESSDATA, this)); throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_PROGRESSDATA, this));
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_NOPROGRESS, false)); 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()) { if((mBandwidthLimit != 0) && !mDownloadData["required"].asBoolean()) {
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, mBandwidthLimit)); throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, mBandwidthLimit));
} else { } else {
throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, -1)); throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, -1));
} }
#endif // LL_WINDOWS || LL_DARWIN
mDownloadPercent = 0; mDownloadPercent = 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment