summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpclient.cpp
AgeCommit message (Expand)Author
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-11Multi-threaded asset uploading with proper ordering first draft.Dave Parks
2010-01-20DEV-35248: Allow NoVerifySSLCert to uniformly disable verificationNat Goodspeed
2009-09-04svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1....Don Kjer
2009-07-09DEV-34822Roxanne Skelly
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-18QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/bran...Christian Goetze
2008-10-17DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be...Brian McGroarty
2008-09-29Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-ca...Aaron Brashears
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-21svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-6...Kyle Ambroff
2008-05-13svn merge -r 87164:87466 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2008-02-07svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-09-10Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-que...Aaron Brashears
2007-08-08svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1Kartic Krishnamurthy
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-01svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-04-05svn merge -r 58913:59058 svn+ssh://svn/svn/linden/branches/rez-content-loss-1...Don Kjer
2007-03-16merge -r58842:59035 branches/loadstone-names to releaseKelly Washington
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-03-05merge r58577:58578 Branch_1-13-3 to releaseKelly Washington
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-02Print done when done.James Cook