summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2012-01-04Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and ↵Xiaohong Bao
LLBufferArray::copyIntoBuffers reviewed by vir
2012-01-04mergeBrad Payne (Vir Linden)
2011-12-20add mutex to protect curl_multi-init()Xiaohong Bao
2011-12-20more tuning of llcurl code targeting crashes like SH-2777.Xiaohong Bao
2011-12-20more tuning of llcurl code targeting crashes like SH-2777.Xiaohong Bao
2011-12-19SH-2738 Don't lock unless we really need toDave Parks
2011-12-19SH-2738 Don't lock unless we really need toDave Parks
2011-12-19SH-2738 Add comment documenting need to not make main thread wait on ↵Dave Parks
curl_multi_perform
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
SH-2738: Texture fetching freezes due to LLcurl SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
SH-2738: Texture fetching freezes due to LLcurl SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-12mergeBrad Payne (Vir Linden)
2011-12-12merge changes for vmrg-204Oz Linden
2011-12-09Backed out changeset fafd857891b1Dave Parks
2011-12-08fix for build error (warning for unreachable code)Richard Linden
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-05mergeDave Parks
2011-12-05SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while ↵Dave Parks
occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05fix for sh-2738: Texture fetching freezes due to LLcurlXiaohong Bao
2011-12-01Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-11-29fix a mac build error: a friend declaration issue.Xiaohong Bao
2011-11-29mergeDave Parks
2011-11-21fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()Xiaohong Bao
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-11-17LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.Nat Goodspeed
Because new enum values have been added to the LLSD type field, a few external switch statements must be adjusted to suppress fatal warnings, even though we never expect to encounter an LLSD instance containing any of the new values.
2011-11-15mergeDave Parks
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