From d571aecd014ef0c1b33298a94a1dbad334a0d097 Mon Sep 17 00:00:00 2001 From: Pork Chop Date: Sun, 3 Mar 2024 00:12:16 +1100 Subject: [PATCH] This reverts commit 3be882c1c6ec035b40f01d3883a13f3891fb8fc9 - Not compatible with LL's version of curl (too old). --- indra/llcorehttp/_httpoprequest.cpp | 7 +------ indra/llcorehttp/httpresponse.h | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index e711451b8a..50317a8f0b 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -276,15 +276,10 @@ void HttpOpRequest::visitNotifier(HttpRequest * request) HttpResponse::TransferStats::ptr_t stats = HttpResponse::TransferStats::ptr_t(new HttpResponse::TransferStats); -#if LL_LINUX - curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD_T, &stats->mSizeDownload); - curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &stats->mTotalTime); - curl_easy_getinfo(mCurlHandle, CURLINFO_SPEED_DOWNLOAD_T, &stats->mSpeedDownload); -#else curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD, &stats->mSizeDownload); curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &stats->mTotalTime); curl_easy_getinfo(mCurlHandle, CURLINFO_SPEED_DOWNLOAD, &stats->mSpeedDownload); -#endif + response->setTransferStats(stats); mUserHandler->onCompleted(this->getHandle(), response); diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h index 1403e1c64f..b834085e5c 100644 --- a/indra/llcorehttp/httpresponse.h +++ b/indra/llcorehttp/httpresponse.h @@ -75,16 +75,9 @@ public: typedef boost::shared_ptr ptr_t; TransferStats() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {} - -#if LL_LINUX - curl_off_t mSizeDownload; - curl_off_t mSpeedDownload; - F64 mTotalTime; -#else F64 mSizeDownload; F64 mTotalTime; F64 mSpeedDownload; -#endif };