summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2011-11-02mergeDave Parks
2011-10-26Merge STORM-959niel@nirvana-win7hp.planescape.home
2011-10-19mergeDave Parks
2011-10-18merge changes for STORM-1654Oz Linden
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-10-05Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fuiRichard Nelson
2011-09-28SH-2276 Remove some log spam to alleviate stalls on login.Dave Parks
2011-09-19SH-2445 Potential fix for crash in LLCurl::Multi::~Multi -- lock sMultiMutex ↵Dave Parks
around curl_multi_ calls in LLCurl::Multi destructor
2011-09-14Trying to fix Mac build issueBrad Payne (Vir Linden)
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- don't run ↵Dave Parks
curl_multi_perform from multiple threads simultaneously.
2011-09-08LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()Logan Dethrow
2011-09-07Merge. Fixed issue with LLProxy code related to changes to the LLSocket ↵Logan Dethrow
interface.
2011-09-06Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to ↵Logan Dethrow
prevent ambiguous name build error.
2011-09-06LLProxy code review fixes.Logan Dethrow
* 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-01LLProxy start of code review cleanup.Logan Dethrow
2011-08-31MergeXiaohong Bao
2011-08-18Backed out revision cbc793dcd3db to disable libcurl verbose logging.Logan Dethrow
2011-08-16Backed out changeset 694594710de2Logan Dethrow
2011-08-15Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.Logan Dethrow
2011-08-15Back out later: Turned on curl verbose logging for debugging purposes.Logan Dethrow
2011-08-15LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was ↵Logan Dethrow
already being called.
2011-08-12mergeLogan Dethrow
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 10:30:14 +0000