750099db68
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
483b4fa993
BUG-134040: Fix broken SOCKS5 proxy
...
Second Life's SOCKS5 proxy has been broken on windows for at least six
years due to a conflation of milliseconds and microseconds in the APR
timeout value used when attempting to ping the proxy.
# Conflicts:
# indra/llmessage/llproxy.cpp
2025-03-11 01:38:10 +02:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
924faa1856
[FIRE-32644]Proxy connect timeout too short
...
Timeout was randomly failing leading to intermittent behaviour with slow localhost proxies and complete failure on network proxies.
2023-01-25 09:38:51 +00:00
705b5568c4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 23:49:28 +02:00
ae48c7c8b3
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
2020-07-21 11:54:11 +03:00
71f6b139f8
SL-13348 Thread crashing singleton #1
2020-05-29 20:10:55 +03:00
32f1dfa531
[DRTVWR-476] - fix compiler errors 32 bit windows build
2020-03-25 18:44:04 -04:00
53354e3513
Merge.
2019-12-07 19:18:27 +01:00
73affdca83
Merge with phoenix-firestorm-lgpl
2019-09-15 17:25:48 +02:00
37eb735ba7
Merged in lindenlab/viewer-release
2019-09-10 20:30:25 +03:00
e1451bb1d1
DRTVWR-493 Do not recreate proxy only to destroy it
2019-09-04 20:56:45 +03:00
2c2bdcf348
[DRTVWR-476] - fix compiler errors 32 bit windows build
2019-06-10 15:56:44 -07:00
36be78e54f
SL-2797 SOCKS5 not working reliably
2019-04-17 18:24:42 +03:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
907efc9cc9
MAINT-5507: Remove llcurl, move constant values and untilities to llcorehttp lib
2015-09-15 17:01:26 -07:00
196caf21a8
MAINT-5507: Removal of sdrpc client/server
...
MAINT-5507: removal of LLCurl::Easy, LLCurl::Multi LLCurl::Responder
2015-09-14 16:10:20 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
3c341a11ab
SH-3468 WIP add memory tracking base class
...
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
6841351502
SH-3468 WIP add memory tracking base class
...
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
6ab0bc8789
LLProxy start of code review cleanup.
2011-09-01 16:44:04 -04:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
5915da89f0
LLProxy cleanup.
...
Made the socks proxy start first in llstartup.cpp
Moved initialization of the proxy to before the HTTP table fetch
Added Doxygen comments to LLProxy methods.
Removed call to applyProxySettings in llxmlrpctransaction.cpp since the ctor of LLCurlEasyRequest will apply the proxy settings.
2011-08-08 15:53:06 -04:00
37f8847085
LLProxy: Added another attempt to download gpu and feature tables after successfully setting up a proxy.
...
Other minor changes:
Clarified why we are using SOCKS5 as the "grid" argument to store proxy credentials.
Added class wide logging to the LLProxy class.
2011-08-04 11:17:03 -04:00
d3b4cc34a8
LLProxy cleanup.
...
* Removed early returns in LLStartup::handleSocksProxy
* Corrected some cases that would result in handleSocksProxy not being called again during login if settings changed
* Allowed for short replies in tcp_handshake in LLProxy.cpp
* Renamed LLProxy::isEnabled() to LLProxy::isSocksProxyEnabled() to clarify its use.
2011-08-02 17:18:54 -04:00
97bedac2a1
Proxy: Improved mutex usage in LLProxy. Introduced an LLAtomic member to track the status of the http proxy that can be checked without locking a mutex.
2011-08-02 11:08:07 -04:00
d2c72cb7e9
STORM-1112 Input sanitization of proxy options.
2011-07-29 15:38:20 -04:00
f15d28a636
Proxy cleanup in llstartup.cpp and llproxy.cpp.
2011-07-28 13:47:20 -04:00
859dc52c30
STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::applyProxySettings()
2011-07-21 15:16:54 -04:00
792667ff8e
STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to curl handles.
...
Added call to that function everywhere curl handles are created in the viewer.
2011-07-19 14:20:21 -04:00
cb24dff9e3
Code cleanup for the SOCKS 5 proxy viewer.
2011-07-13 16:46:36 -04:00
f630f997c0
Changed lllog messages in llproxy.cpp to new macros.
2011-07-06 18:49:22 -04:00
975975029d
STORM-1112 Fixed crash on quit. Other minor fixes:
...
* Reordered HTTP proxy choices in settings dialog
* Now using setBlocking and setNonBlocking LLSocket methods during TCP handshakes.
* Made those LLSocket methods available outside the class.
2011-07-05 16:55:43 -04:00
7717b6f647
STORM-1112 More cleanup of SOCKS 5 proxy code.
...
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28 19:54:53 -04:00
Ansariel