livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Ansariel 2023-10-04 02:44:34 +02:00
parent e14473f2c7 3be882c1c6
commit 4c8f170098
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
autobuild.xml
View File

@ -5,7 +5,7 @@
<key>SDL2</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1997-2022 Sam Lantinga</string>
<string>Copyright (C) 1997-2023 Sam Lantinga</string>
<key>description</key>
<string>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.</string>
<key>license</key>
@ -21,9 +21,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ba107bef7cdb9c8548d62e749d9af6fd</string>
<string>535006965531b4a92e4951ee8dbe2745</string>
<key>url</key>
<string>http://3p.firestormviewer.org/SDL2-2.24.1-linux64-222872152.tar.bz2</string>
<string>http://3p.firestormviewer.org/SDL2-2.28.4-linux64-232750919.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -865,9 +865,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>bacaa5403be0f1cba52b2250c2c227d9</string>
<string>8e92fc9ec2b3be6d2a5387fc283f954f</string>
<key>url</key>
<string>http://3p.firestormviewer.org/curl-7.81.0.222121724-linux64-222121724.tar.bz2</string>
<string>http://3p.firestormviewer.org/curl-8.3.0.232750741-linux64-232750741.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2457,9 +2457,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>b460d5bac2d20b38cb73b54d0ab1b6e3</string>
<string>57670eaa6333d9127b8ba88f120e56dd</string>
<key>url</key>
<string>http://3p.firestormviewer.org/nghttp2-1.25.0.180841549-linux64-180841549.tar.bz2</string>
<string>http://3p.firestormviewer.org/nghttp2-1.56.0.232750738-linux64-232750738.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2621,9 +2621,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>8ad6779b81899afb7bd803ac2e2af37a</string>
<string>b329ed955ac63da45957d39f601e85af</string>
<key>url</key>
<string>http://3p.firestormviewer.org/open_libndofdev-0.13.222872202-linux64-222872202.tar.bz2</string>
<string>http://3p.firestormviewer.org/open_libndofdev-0.13.232750923-linux64-232750923.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2785,9 +2785,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>cdd9c6c484542a2e1be99149c4f0e75f</string>
<string>a3b2dbffa28a2b2a63c5d3ce2c12bc85</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openssl-1.1.1l.222121440-linux64-222121440.tar.bz2</string>
<string>http://3p.firestormviewer.org/openssl-1.1.1w.232750656-linux64-232750656.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

7
indra/llcorehttp/_httpoprequest.cpp
View File

@ -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);

7
indra/llcorehttp/httpresponse.h
View File

@ -75,9 +75,16 @@ public:
typedef boost::shared_ptr<TransferStats> 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
};

16
indra/newview/skins/default/xui/it/panel_profile_secondlife.xml
View File

@ -6,6 +6,14 @@
<string name="status_offline">
Offline
</string>
<string name="status_unknown">
Sconosciuto
</string>
<string name="CaptionTextAcctInfo">
[ACCTTYPE]
[PAYMENTINFO]
[FSDEV][FSSUPP][FSQA][FSGW][FIRESTORM]
</string>
<string name="payment_update_link_url">
http://www.secondlife.com/account/billing.php?lang=en
</string>
@ -21,10 +29,10 @@
<string name="display_name_text_args">
[DISPLAY_NAME]
</string>
<string name="FSDev" value="Sviluppatore"/>
<string name="FSSupp" value="Assistenza"/>
<string name="FSQualityAssurance" value="Bug Hunter"/>
<string name="FSGW" value="Gateway"/>
<string name="FSDev" value="Sviluppatore "/>
<string name="FSSupp" value="Supporto "/>
<string name="FSQualityAssurance" value="Bug Hunter "/>
<string name="FSGW" value="Gateway "/>
<text name="name_label" value="Nome:"/>
<button label="Nome:" name="set_name" tool_tip="Imposta nome visualizzato"/>
<panel name="name_holder">