summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2012-12-17SH-3604 FIX - resolved an issue with simulated failures/retry logicBrad Payne (Vir Linden)
2012-12-14Automated mergeDon Kjer
2012-12-14Updating shaders to not crash when compiled in llvmDon Kjer
2012-12-14merge changes for DRTVWR-224Oz 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-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 operatio...Brad Payne (Vir Linden)
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
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 boost::fun...Brad Payne (Vir Linden)
2012-12-10mergeBrad Payne (Vir Linden)
2012-12-07SH-3606 WIP - moving classes to more reusable locationBrad Payne (Vir Linden)
2012-12-06Automated mergeDon Kjer
2012-12-06Alpha rendering fixes for appearance utility.Don Kjer
2012-12-06SH-3604 FIX - switched link creation in updateCOF() to use retry path, better...Brad Payne (Vir Linden)
2012-12-05merge changes for MAINT-1955Nat Goodspeed
2012-12-05merge changes for DRTVWR-259Nat Goodspeed
2012-12-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
2012-12-05merge changes for MAINT-1953Nat Goodspeed
2012-12-05removed yet another unintended commit of logcontrol.xmlBrad Payne (Vir Linden)
2012-12-05mergeBrad Payne (Vir Linden)
2012-12-05Possible fix for TC build failureBrad Payne (Vir Linden)
2012-12-05Merge.Logan Dethrow
2012-12-05Linux Viewer build fixes.Logan Dethrow
2012-12-05SH-3604 WIP - backed out logcontrol.xml changeBrad Payne (Vir Linden)
2012-12-05SH-3604 WIP - retry mechanism for batch inventory ops, handle either completi...Brad Payne (Vir Linden)
2012-12-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-05merge changes for DRTVWR-254Nat Goodspeed
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com