summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2011-07-21mergeBrad Payne (Vir Linden)
2011-07-21mergeBrad Payne (Vir Linden)
2011-07-21merge changes for eli2_viewer-developmentOz Linden
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-20still trying to fix channelsBrad Payne (Vir Linden)
2011-07-19SH-2090 FIX - cherry pick from davep commitBrad Payne (Vir Linden)
2011-07-19addendum to prim fixBrad Payne (Vir Linden)
2011-07-19Cherry pick of https://bitbucket.org/lindenlab/mesh-development/changeset/9ce...Brad Payne (Vir Linden)
2011-07-19mergeBrad Payne (Vir Linden)
2011-07-18SH-1904 FIX (cherry pick from original by bao)Brad Payne (Vir Linden)
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18increment viewer version to 2.8.2Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true to...jenn
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how t...Aaron Stone
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15STORM-1482 Change the defaults, look in the app_settings dir for configs as w...Aaron Stone
2011-07-15merge changes for storm-1509Oz Linden
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region environm...Vadim ProductEngine
2011-07-14Potential fix for SH-1854 and SH-1125 (caps issues)Don Kjer
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-14STORM-1482 Little bit of Windows crash report value logging.Aaron Stone
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-14mergeDave Parks
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-13merge changes for storm-1507Oz Linden
2011-07-13merge changes for open-99Oz Linden
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-12MergeDon Kjer
2011-07-12Changes to support SH-1894: Textures uploaded with Mesh do not appear in inve...Don Kjer
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used...jenn
2011-07-12CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.Nat Goodspeed
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some c...Aaron Stone
2011-07-12mergeDave Parks
2011-07-12SH-1125 Retry when failing to get seed capability.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao