summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-06-26fix merge conflicts: v-r to dranoXiaohong Bao
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-14fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sess...Xiaohong Bao
2012-06-12for SH-3073: implement a fast cache system for texture fetchingXiaohong Bao
2012-06-11mergeBrad Payne (Vir Linden)
2012-06-11avatar metrics - cleanup, removed unused fieldsBrad Payne (Vir Linden)
2012-06-08SH-3145 : Expose update fetch and update priorities magic numbers in settings...Merov Linden
2012-06-08Merge pull from vir/dranoMerov Linden
2012-06-08SH-3153 FIXBrad Payne (Vir Linden)
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-08mergeBrad Payne (Vir Linden)
2012-06-08avatar metrics - removed unused fieldsBrad Payne (Vir 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-06MAINT-1144: Unblock build for previous commit.Nat Goodspeed
2012-06-06MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.Nat Goodspeed
2012-06-04mergeBrad Payne (Vir Linden)
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-06-01mergeBrad Payne (Vir Linden)
2012-05-31fix for MAINT-1113: [PUBLIC_JIRA_USERS][crashhunters] crash at LLViewerTextur...Xiaohong Bao
2012-05-30SH-3039 WIP - track sequence number and other standard fields in avatar appea...Brad Payne (Vir Linden)
2012-05-29Automated merge with https://bitbucket.org/VirLinden/dranoXiaohong Bao
2012-05-29fo SH-3074: clear ghost and stale texture fetching requests in time.Xiaohong Bao
2012-05-29SH-3135 Viewer UI corruptionNyx Linden
2012-05-29merge changes for DRTVWR-153Oz Linden
2012-05-29merge changes for DRTVWR-155Oz Linden
2012-05-29merge changes for DRTVWR-148Oz Linden
2012-05-26merge changes for DRTVWR-156Oz Linden
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-25trivial: fix a linux compiling error.Xiaohong Bao
2012-05-25fix for SH-3137: delay to issue new http fetching requests if http connection...Xiaohong Bao
2012-05-24merge changes for DRTVWR-154Oz Linden
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-05-24FIX VWR-23844 VWR-26542 VWR-28950eli
2012-05-24sync with viewer-releaseeli
2012-05-24Automated merge with https://bitbucket.org/VirLinden/dranoXiaohong Bao
2012-05-24fix for VWR-28996: Texture stalls and threading modelsXiaohong Bao
2012-05-22merge changes for DRTVWR-152Oz Linden
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-22merge changes for DRTVWR-147Oz Linden
2012-05-21MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
2012-05-18MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-17MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.Dave Parks
2012-05-17SH-3134 : Fix the http callback clearing the url so that further requests wil...Merov Linden
2012-05-17MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)Paul ProductEngine