summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-20merge back beta fixesOz Linden
2012-08-17Expanding region flags to 64 bits. Adding region protocol flagsDon Kjer
2012-08-13PATH-849: CRASHFIX This should fix the crash caused by LLPathfindingObject::h...Todd Stinson
2012-08-07SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
2012-08-03Merge of viewer-development (3.4.1).Monty Brandenberg
2012-08-02Added AppearanceData block to AvatarAppearance messageDon Kjer
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-07-16SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-07-02Merge 3.3.3 release with Drano HTTP library at 3.3.0Monty Brandenberg
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-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-08Limit libcurl's DNS resolution to IPV4 addresses for now. CallersMonty Brandenberg
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-06-01Platform fixups Linux: unused variables, make error strings constant.Monty Brandenberg
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