summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-14merge changes for 3.4.2-beta4Oz Linden
2012-11-13DRTVWR-210: sanitize ampersand embedded in strings.xml messagesNat Goodspeed
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13MAINT-1890: Adding a more descriptive comment to this hack fix for future ref...William Todd Stinson
2012-11-13MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD...William Todd Stinson
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-12MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the...William Todd Stinson
2012-11-12MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() metho...William Todd Stinson
2012-11-09pull back 3.4.2-beta3 fixesOz Linden
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fi...William Todd Stinson
2012-11-08merge changes for DRTVWR-240Oz Linden
2012-11-08merge up to viewer-developmentOz Linden
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-07INTL-46 massive Chinese translation update for set28--set34, including new fileseli
2012-11-07sync with viewer-development (for 1 DE file)eli
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
2012-11-07merge changes for 3.4.2-beta2Oz Linden
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz Linden
2012-11-05STEAM-14: login when user presses Enter at username or password.Nat Goodspeed
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05increment version to 3.4.3Oz Linden
2012-11-05merge up to latest viewer-developmentOz Linden
2012-11-02merge back fixes from 3.4.1-beta12Oz Linden
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-25MergeKelly Washington
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24disable tcmalloc againOz Linden
2012-10-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding cp...callum_linden
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and CXXFLA...Don Kjer
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19merge back late fix for MAINT-1753Oz Linden