summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
2013-01-04More fixes for linux build of lltrace changesAndrew Meadows
2012-12-21SH-3468 WIP add memory tracking base classRichard Linden
2012-12-19fix for SH-3640: Can not edit objectsXiaohong Bao
2012-12-18fix for SH-3624: Object deletion does not workXiaohong Bao
2012-12-18SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2012-12-18Automated merge with ssh://hg.lindenlab.com/bao/bao-viewer-interesting/Xiaohong Bao
2012-12-18fix for SH-3619: some objects are missingXiaohong Bao
2012-12-18SH-3468 WIP add memory tracking base classRichard 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 Deb...William Todd Stinson
2012-12-14merge changes for DRTVWR-224Oz Linden
2012-12-13mergeAndrew Meadows
2012-12-13We now handle local_id=0 in KillObject as a prefix to deleted local_id's.Andrew Meadows
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-12sync with viewer-developmenteli
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-12fix for SH-3622: crash on LLViewerRegion::updateVisibleEntriesXiaohong Bao
2012-12-12MAINT-2082: fix deletion of an autoreplace listOz Linden
2012-12-12MAINT-2051: Implement replacement of an existing autoreplace listOz Linden
2012-12-11Merged from viewer-releaseAura Linden
2012-12-09SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2012-12-07SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2012-12-06SH-3406 WIP convert fast timers to lltrace systemRichard 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-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-04SH-3406 WIP convert fast timers to lltrace systemRichard Linden
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
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing entries...Dave Parks
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com