diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-12-17 15:59:51 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-12-17 15:59:51 -0800 |
| commit | f95effdacf8ef4400ad49059f00570f0bc8403aa (patch) | |
| tree | 96476802dea379bfea57e6f0e4e89f90d46de997 /indra/viewer_components/updater | |
| parent | 63dec2a9b97776f5f7a2996b58bb446341458250 (diff) | |
Better fix for CHOP-286 - reenabled bandwidth limits on linux now that we've fixed the freeze.
Diffstat (limited to 'indra/viewer_components/updater')
| -rw-r--r-- | indra/viewer_components/updater/llupdatedownloader.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp index 85261a3252..e88d1bf811 100644 --- a/indra/viewer_components/updater/llupdatedownloader.cpp +++ b/indra/viewer_components/updater/llupdatedownloader.cpp @@ -427,13 +427,9 @@ 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 + // if it's a required update set the bandwidth limit to 0 (unlimited) + curl_off_t limit = mDownloadData["required"].asBoolean() ? 0 : mBandwidthLimit; + throwOnCurlError(curl_easy_setopt(mCurl, CURLOPT_MAX_RECV_SPEED_LARGE, limit)); mDownloadPercent = 0; } |