summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-01-09Automated merge with https://hg.lindenlab.com/richard/viewer-interestingXiaohong Bao
2013-01-09fix the merge errors from the changeset 3eadda9666cfXiaohong Bao
2013-01-10yet more gcc fixesAndrew Meadows
2013-01-10gcc fixesAndrew Meadows
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
2013-01-10gcc fixesAndrew Meadows
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09SH-3468 WIP add memory tracking base classRichard Linden
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-08SH-3468 WIP add memory tracking base classRichard Linden
2013-01-08SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2013-01-08MergeXiaohong Bao
2013-01-08merge changes for DRTVWR-277Oz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08SH-3468 WIP add memory tracking base classRichard Linden
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07merge with headcallum_linden
2013-01-06SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-04More fixes for linux build of lltrace changesAndrew Meadows
2013-01-03fixing linux compile errors for llcommon after LLTrace workAndrew Meadows
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
2013-01-03SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2013-01-02merge changes for DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-23SH-3468 WIP add memory tracking base classRichard Linden
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
2012-12-21SH-3468 WIP add memory tracking base classRichard Linden
2012-12-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20merge changes for DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden
2012-12-19fix for SH-3640: Can not edit objectsXiaohong Bao
2012-12-19merge changes for 3.4.4-beta2Oz Linden