summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once the test fails, rerunning that test will replay the same failure to try to permit debugging it. But that behavior is extremely undesirable under TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-18Automated mergeDon Kjer
2012-12-18Fix for alpha blending using gl fixed-functions not matching shader ↵Don Kjer
implementation
2012-12-18Switched mkTempDir back to using apple standard tempdir behavior instead of /tmpAura Linden
2012-12-18MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunkNat Goodspeed
2012-12-18FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systemscallum_linden
2012-12-18MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.Nat Goodspeed
2012-12-18SH-3604 WIP - more frequent polling for retriesBrad Payne (Vir Linden)
2012-12-18SH-3604 WIP - fixed a case with retry logicBrad Payne (Vir Linden)
2012-12-17SH-3629 WIP - avoid clobbering links to desired items that are already in ↵Brad Payne (Vir Linden)
the COF, as will be the case when wearing an outfit with required body parts missing
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-17mergeBrad Payne (Vir Linden)
2012-12-17SH-3629 WIP - fixed out-of-order outfit itemsBrad Payne (Vir Linden)
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-17MAINT-2134: Removing llassert() calls that were causing problems with the ↵William Todd Stinson
Debug and RelWithDebInfo builds. Also, reworked the rest of the methods to only apply in cases where the class instance has been initialized.
2012-12-17increment version to 3.4.5Oz Linden
2012-12-17SH-3604 FIX - resolved an issue with simulated failures/retry logicBrad Payne (Vir Linden)
2012-12-17merge changes for DRTVWR-244Oz Linden
2012-12-16MergedAura Linden
2012-12-16Fixed small one-time memory leaks.Aura Linden
2012-12-14Automated mergeDon Kjer
2012-12-14BOOL vs bool FIGHTAura Linden
2012-12-14Reverting back to 32-bit colordepth requirement on linuxDon Kjer
2012-12-14Updating shaders to not crash when compiled in llvmDon Kjer
2012-12-14merge changes for DRTVWR-224Oz Linden
2012-12-13Fixes from Oz's merge.Aura Linden
2012-12-14Attempt at fixing linux shader support on ubuntu 12.04Don Kjer
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13Fix for SH-3591.prep@lindenlab.com
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-13Fixed whitespace issues for merge.Aura Linden
2012-12-13merge changes for DRTVWR-266Oz Linden
2012-12-13Fix line endings.Kelly Washington
2012-12-13MAINT-1995 Names of banned and allowed residents are not shown in Access tab ↵Kelly Washington
of the About Land dialog Code by Richard, reviewed by merov and kelly
2012-12-12sync with viewer-developmenteli
2012-12-12mergeBrad Payne (Vir Linden)
2012-12-12SH-3604 WIP - fixed a failure when base outfit link did not need to be createdBrad Payne (Vir Linden)
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com