summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
2012-12-12Fix for problem found with changing to an outfit with missing shapeBrad Payne (Vir Linden)
2012-12-12MAINT-2082: fix deletion of an autoreplace listOz Linden
2012-12-12Fixes for SH-3591 & SH-3620prep
2012-12-12MAINT-2051: Implement replacement of an existing autoreplace listOz Linden
2012-12-12Updating linux libGLOD to match darwin namingDon Kjer
2012-12-11Merged from viewer-releaseAura Linden
2012-12-11mergeBrad Payne (Vir Linden)
2012-12-11SH-3604 WIP - added base outfit link creation to retryable copy/link ↵Brad Payne (Vir Linden)
operations. Resolves race condition with cof version and server texture bakes
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2012-12-11Fix for building on case-sensitive mac filesystems. Fix to remove unwind ↵Don Kjer
spam warnings while linking on xcode 4.5.2 builds
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-11Crash reporter fixed, debugging removed.Aura Linden
2012-12-11Interim debug checkin to test from teamcityAura Linden
2012-12-10merge changes for DRTVWR-260Oz Linden
2012-12-10SH-3606 WIP - fixed bug found by persnickety compilerBrad Payne (Vir Linden)
2012-12-10removed inadvertent commit of logcontrol.xmlBrad Payne (Vir Linden)
2012-12-10SH-3606 WIP - replaced several LLInventoryCallback subclasses with ↵Brad Payne (Vir Linden)
boost::func equivalents
2012-12-10mergeBrad Payne (Vir Linden)
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-07Restored test_llcorehttp_peer.py, hopefully breaking the 'hg copy' link that ↵Logan Dethrow
was causing changesets intended for its copy parent to be applied to the child file.
2012-12-07Deleting test_llcorehttp_peer.py because it has been corrupted by changes to ↵Logan Dethrow
test_llsdmessage_peer.py, which it was copied from. The file will be recreated using an unchanged file.
2012-12-07SH-3606 WIP - moving classes to more reusable locationBrad Payne (Vir Linden)
2012-12-06Added compiled AutoUpdater.nib made from new AutoUpdater.xibAura Linden
2012-12-06Fixed several minor issues with validation.Aura Linden
2012-12-06Automated mergeDon Kjer
2012-12-06Alpha rendering fixes for appearance utility.Don Kjer
2012-12-06On Linux now use the default system python instead of defaulting to ↵Logan Dethrow
python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
2012-12-06SH-3604 FIX - switched link creation in updateCOF() to use retry path, ↵Brad Payne (Vir Linden)
better stats reporting, fixed failure logic
2012-12-05merge changes for MAINT-1955Nat Goodspeed