summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-29Added test back in, skip() call need to be removed.simon@Simon-PC.lindenlab.com
2012-06-28mergeDave Parks
2012-06-28mergeDave Parks
2012-06-27Fix for linux build (skip llhttpclient unit tests that post to google.com)Dave Parks
2012-06-26fix merge conflicts: v-r to dranoXiaohong Bao
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22mergeDave Parks
2012-06-18merge to pathfinding development branchOz Linden
2012-06-15MergeDave Parks
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-07merge changes for DRTVWR-162Oz Linden
2012-06-07mergeBrad Payne (Vir Linden)
2012-06-07MAINT-1144: Merge llhttpclient_test.cpp fix back to tipNat Goodspeed
2012-06-07MAINT-1144: Try to fix Windows build error in llhttpclient_test.cpp.Nat Goodspeed
2012-06-06Automated merge with file:///Users/nat/linden/viewer-maint-1144Nat Goodspeed
2012-06-06MAINT-1144: Re-enable skipped LLHTTPClient tests with local server.Nat Goodspeed
2012-06-06MAINT-1144: Break out llhttpclient_tut as standalone integration test.Nat Goodspeed
2012-06-04mergeBrad Payne (Vir Linden)
2012-05-25Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-25fix for SH-3137: delay to issue new http fetching requests if http connection...Xiaohong Bao
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-05-24fix for VWR-28996: Texture stalls and threading modelsXiaohong Bao
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-09Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-05-07Pull from vir/dranoMerov Linden
2012-05-03SH-3079 FIX - minimize retries and avoid log spam when people API is missingBrad Payne (Vir Linden)
2012-05-02Pull from vir/dranoMerov Linden
2012-05-02SH-3126 : Improve curl byte range call, test implementation in lltexturefetch...Merov Linden
2012-05-02merge viewer-release to dranoBrad Payne (Vir Linden)
2012-04-26Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-04-25WOLF-318: change default verbosity of some unit tests to keep them out of the...Oz Linden
2012-04-23SH-3115 FIX Crash on exit, curl handles not emptycallum
2012-03-16Removing unreachable code from the viewer. Corresponding changes made on the...Todd Stinson
2012-03-13pull and merge from viewer-developmentprep
2012-02-28PATH-199: Cleaning up code related to object flags so that I can better use t...Todd Stinson
2012-04-26Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-04-25SEC-995 FIX viewer is easily spammed to death by chatKelly Washington
2012-02-15Fix llprocess_test.cpp's exception catching for Linux.Nat Goodspeed
2012-03-08fix for MAINT-701: crash at LLCurl::Multi::markDead()Xiaohong Bao
2012-02-06Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2012-02-03fix for SH-2941: crash at LLCurl::Easy::~Easy()Xiaohong Bao
2012-02-01cleaned up linden_common.h, removing stuff that is mostly unusedRichard Linden
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2012-01-25Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut...Xiaohong Bao