summaryrefslogtreecommitdiff
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-21Added tag 3.3.3-release for changeset 6428242e124bOz Linden
2012-06-18Added tag 3.3.3-beta3 for changeset 4b3c68199a86Oz Linden
2012-06-18tag merge of DRTVWR-169Oz Linden
2012-06-18MAINT-1144: Update with relevant apr_suite fix.Nat Goodspeed
2012-06-18MAINT-1144: Update to apr_suite containing relevant fix.Nat Goodspeed
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-09Added tag 3.3.3-beta2 for changeset fdcc08a4f20aOz Linden
2012-06-09tag merge of DRTVWR-165Oz 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-08tag merge of DRTVWR-162Oz Linden
2012-06-08mergeBrad Payne (Vir Linden)
2012-06-08avatar metrics - removed unused fieldsBrad Payne (Vir Linden)
2012-06-08tag merge of DRTVWR-164Oz 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-04Added tag 3.3.3-beta1, DRTVWR-144 for changeset f0a174c2adb4Oz Linden
2012-06-04tag merge of DRTVWR-160Oz Linden
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-29Added tag DRTVWR-144, 3.3.3-beta1 for changeset 1b7f311b5a5dOz Linden
2012-05-29merge changes for DRTVWR-153Oz Linden
2012-05-29tag merge of DRTVWR-153Oz Linden
2012-05-29merge changes for DRTVWR-155Oz Linden
2012-05-29tag merge of DRTVWR-155Oz Linden
2012-05-29merge back change to force ticket number from viewer-releaseOz Linden
2012-05-29merge changes for DRTVWR-148Oz Linden
2012-05-29tag merge of DRTVWR-148Oz Linden
2012-05-28inconsequential change to force new ticket numberOz Linden
2012-05-26merge changes for DRTVWR-156Oz Linden
2012-05-26tag merge of DRTVWR-156Oz Linden