summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2011-08-09merge changes for storm-1186Oz Linden
2011-08-08mergeLogan Dethrow
2011-08-08LLProxy cleanup.Logan Dethrow
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-04LLProxy: Added another attempt to download gpu and feature tables after ↵Logan Dethrow
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-02LLProxy cleanup.Logan Dethrow
* 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-02SH-2183 Thread local storage initialization is unreliable.Dave Parks
2011-08-02SH-2183 Only apply multi-threaded curl on the main thread.Dave Parks
2011-08-02Proxy: Improved mutex usage in LLProxy. Introduced an LLAtomic member to ↵Logan Dethrow
track the status of the http proxy that can be checked without locking a mutex.
2011-08-01SH-2183 Add a debug setting to control whether or not to use multiple ↵Dave Parks
threads in LLCurl
2011-08-01STORM-1186 FIXED Removed the "no mCurrentRMessageTemplate" warning message.Vadim ProductEngine
The mCurrentRMessageTemplate member seems to only be non-NULL for a short while after an incoming message was validated and parsed, thus there is no guarantee that we can obtain name of the last received message at any given time. So if we can't we'll simply return an empty string without spamming the log with warnings.
2011-07-29STORM-1112 Input sanitization of proxy options.Logan Dethrow
2011-07-28Proxy cleanup in llstartup.cpp and llproxy.cpp.Logan Dethrow
2011-07-28MergeLogan Dethrow
2011-07-28SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.Dave Parks
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
2011-07-22SH-2031 Fix for sometimes deadlocking a curl thread.Dave Parks
2011-07-22SH-2031 Cleanup from threaded curl implementation (remove errors/loops on ↵Dave Parks
shutdown).
2011-07-21SH-2031 Followup to curl threading work -- don't start and stop the thread ↵Dave Parks
on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms)
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
Reviewed by Kelly
2011-07-21STORM-1112 Protected LLProxy members during cross-thread calls to ↵Logan Dethrow
LLProxy::applyProxySettings()
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to ↵Logan Dethrow
curl handles. Added call to that function everywhere curl handles are created in the viewer.
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-13Code cleanup for the SOCKS 5 proxy viewer.Logan Dethrow
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13STORM-1112 Fixed network buffers that need to have space for the SOCKS proxy ↵Logan Dethrow
header.
2011-07-12mergeLogan Dethrow
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-09Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-07CHOP-661: Fix HTTPServer usage to turn off allow_reuse_address.Nat Goodspeed
Turns out that BaseHTTPServer.HTTPServer turns on that flag by default, which causes freeport() to fail (on Windows only?), happily instantiating multiple servers on the same port. Change known instances, fix freeport() docstring to highlight the issue. Add freeport() unit tests to verify expected behavior.
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-06Changed lllog messages in llproxy.cpp to new macros.Logan Dethrow
2011-07-05STORM-1112 Fixed crash on quit. Other minor fixes:Logan Dethrow
* 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-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE.
2011-07-01merge viewer-development -> mesh-developmentBrad Payne (Vir Linden)
2011-06-30MergeLogan Dethrow
2011-06-29merge changes for storm-1368Oz Linden
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-06-22Merge, fixed build issues by refactoring SOCKS 5 code.Logan Dethrow
2011-06-21MergeLogan Dethrow
2011-06-21Refactored SOCKS 5 handshake to use existing LLSocket class.Logan Dethrow
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-16Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-10STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden ↵Logan Dethrow
Coding Standard and comments in the code review.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-06-08Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and ↵Logan Dethrow
socks5.h.
2011-06-03automated mergeRoxie Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:34:04 +0000