diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-12-17 14:26:55 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-12-17 14:26:55 -0800 |
| commit | 63dec2a9b97776f5f7a2996b58bb446341458250 (patch) | |
| tree | 2267034ba897e15df17cdc62c85e14de63778926 /indra | |
| parent | 3c3c9a0d4918cd5c794504d98f8d81eb47ee8121 (diff) | |
Temporary workaround for CHOP-286: bandwidth limits freeze the downloader thread on linux
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/viewer_components/updater/llupdatedownloader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp index f259e06476..85261a3252 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; } |