diff --git a/autobuild.xml b/autobuild.xml index b135c99810..6fa46093e1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -5,7 +5,7 @@ SDL2 copyright - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga description Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. license @@ -21,9 +21,9 @@ archive hash - ba107bef7cdb9c8548d62e749d9af6fd + 535006965531b4a92e4951ee8dbe2745 url - http://3p.firestormviewer.org/SDL2-2.24.1-linux64-222872152.tar.bz2 + http://3p.firestormviewer.org/SDL2-2.28.4-linux64-232750919.tar.bz2 name linux64 @@ -865,9 +865,9 @@ archive hash - bacaa5403be0f1cba52b2250c2c227d9 + 8e92fc9ec2b3be6d2a5387fc283f954f url - http://3p.firestormviewer.org/curl-7.81.0.222121724-linux64-222121724.tar.bz2 + http://3p.firestormviewer.org/curl-8.3.0.232750741-linux64-232750741.tar.bz2 name linux64 @@ -2457,9 +2457,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - b460d5bac2d20b38cb73b54d0ab1b6e3 + 57670eaa6333d9127b8ba88f120e56dd url - http://3p.firestormviewer.org/nghttp2-1.25.0.180841549-linux64-180841549.tar.bz2 + http://3p.firestormviewer.org/nghttp2-1.56.0.232750738-linux64-232750738.tar.bz2 name linux64 @@ -2621,9 +2621,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 8ad6779b81899afb7bd803ac2e2af37a + b329ed955ac63da45957d39f601e85af url - http://3p.firestormviewer.org/open_libndofdev-0.13.222872202-linux64-222872202.tar.bz2 + http://3p.firestormviewer.org/open_libndofdev-0.13.232750923-linux64-232750923.tar.bz2 name linux64 @@ -2785,9 +2785,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cdd9c6c484542a2e1be99149c4f0e75f + a3b2dbffa28a2b2a63c5d3ce2c12bc85 url - http://3p.firestormviewer.org/openssl-1.1.1l.222121440-linux64-222121440.tar.bz2 + http://3p.firestormviewer.org/openssl-1.1.1w.232750656-linux64-232750656.tar.bz2 name linux64 diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index c70d2a44d7..ca4a40458c 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -272,10 +272,15 @@ 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 b834085e5c..1403e1c64f 100644 --- a/indra/llcorehttp/httpresponse.h +++ b/indra/llcorehttp/httpresponse.h @@ -75,9 +75,16 @@ 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 }; diff --git a/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml index 02a9a82ed6..d3ce9841fb 100644 --- a/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml @@ -6,6 +6,14 @@ Offline + + Sconosciuto + + +[ACCTTYPE] +[PAYMENTINFO] +[FSDEV][FSSUPP][FSQA][FSGW][FIRESTORM] + http://www.secondlife.com/account/billing.php?lang=en @@ -21,10 +29,10 @@ [DISPLAY_NAME] - - - - + + + +