summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-01-11fix line endingscallum_linden
2013-01-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-11SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. ...Brad Payne (Vir Linden)
2013-01-11mergeBrad Payne (Vir Linden)
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10mergeBrad Payne (Vir Linden)
2013-01-10SH-3639 WIP - increased retry interval to allow for intermittent extremely sl...Brad Payne (Vir Linden)
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10SH-3142: Added a debug option that circumvents the precache delay when telepo...prep
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
2013-01-09SH-3600. Undo change is disabled upon reentry into the appearance panelprep
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-09mergeprep
2013-01-09SH-3620: Fix for editing a nocopy wearable being removed from the outfitprep
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-08mergeBrad Payne (Vir Linden)
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07SH-3344 WIP - keep avatar local textures flagged no-delete while in useBrad Payne (Vir Linden)
2013-01-07merge with headcallum_linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
2013-01-02merge changes for DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-21mergeBrad Payne (Vir 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-20Disabling build of headless appearance utilityDon Kjer
2012-12-20Skipping rendering of unneeded morph masksDon Kjer
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-20SH-3344 WIP - additional debugging output for avatar local texturesBrad Payne (Vir Linden)
2012-12-19merge changes for 3.4.4-beta2Oz Linden
2012-12-19merge changes for DRTVWR-270Oz Linden
2012-12-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2012-12-19MAINT-1986: merge in TeamCity check in hashmap_testNat Goodspeed
2012-12-19MAINT-1986: merge in server-trunk fixesNat Goodspeed
2012-12-19MAINT-1986: in TeamCity, do not reload saved hashmap_test data.Nat Goodspeed
2012-12-18Automated mergeDon Kjer
2012-12-18Fix for alpha blending using gl fixed-functions not matching shader implement...Don Kjer