summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
AgeCommit message (Expand)Author
2011-08-08mergeLogan Dethrow
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-01SH-2183 Add a debug setting to control whether or not to use multiple threads...Dave Parks
2011-07-28Proxy cleanup in llstartup.cpp and llproxy.cpp.Logan Dethrow
2011-07-28MergeLogan Dethrow
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to cur...Logan Dethrow
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-25mergeDave Parks
2010-07-22EXT-7145 - Handle http redirects in viewer properly. Didn't work before.Palmer
2010-06-07Merge with render-pipelineDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07merge from viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-02-17Post-review cleanup.Dave Parks
2010-02-17Switched program database on windows to edit and continue for non-release bui...Dave Parks
2010-02-11Multi-threaded asset uploading with proper ordering first draft.Dave Parks
2010-01-20DEV-35248: Allow NoVerifySSLCert to uniformly disable verificationNat Goodspeed
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-09-08Merge from trunkBryan O'Sullivan
2009-09-04svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1....Don Kjer
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-07-08DEV-34822 - merge with 1.23Roxanne Skelly
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-06-21svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-6...Kyle Ambroff
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-21Copyright info added to llcurlSteven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts