summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-20merge changes for DRTVWR-271Oz Linden
2012-12-20tag merge of DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden
2012-12-19fix for SH-3640: Can not edit objectsXiaohong Bao
2012-12-19merge changes for 3.4.4-beta2Oz Linden
2012-12-19Added tag 3.4.4-beta2 for changeset cd39255bd233Oz Linden
2012-12-19merge changes for DRTVWR-270Oz Linden
2012-12-19tag merge of DRTVWR-270Oz Linden
2012-12-19change to use lindenlab repo for havok source, with new licenseOz Linden
2012-12-19upgrade boost build to use public build of icu4cOz Linden
2012-12-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2012-12-19MAINT-1986: merge in TeamCity check in hashmap_testNat Goodspeed
2012-12-19MAINT-1986: merge in server-trunk fixesNat Goodspeed
2012-12-19MAINT-1986: in TeamCity, do not reload saved hashmap_test data.Nat Goodspeed
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once the test fails, rerunning that test will replay the same failure to try to permit debugging it. But that behavior is extremely undesirable under TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-18fix for SH-3624: Object deletion does not workXiaohong Bao
2012-12-18SH-3406 WIP convert fast timers to lltrace systemRichard Linden
removed some potential data races got memory stats recording in trace system
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-18Switched mkTempDir back to using apple standard tempdir behavior instead of /tmpAura Linden
2012-12-18MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunkNat Goodspeed
2012-12-18MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.Nat Goodspeed
2012-12-18tag merge of DRTVWR-268Oz Linden
2012-12-18SH-3468 WIP add memory tracking base classRichard Linden
created memory tracking trace type instrumented a few classes with memory tracking
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
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 ↵William Todd Stinson
Debug and RelWithDebInfo builds. Also, reworked the rest of the methods to only apply in cases where the class instance has been initialized.
2012-12-17increment version to 3.4.5Oz Linden
2012-12-17Added tag 3.4.4-beta1 for changeset 083d2d36b5bbOz Linden
2012-12-17pull back 3.4.3-release tagOz Linden
2012-12-17Added tag 3.4.3-release for changeset 0a2ca6546b49Oz Linden
2012-12-17merge changes for DRTVWR-244Oz Linden
2012-12-17tag merge of DRTVWR-244Oz Linden
2012-12-16MergedAura Linden
2012-12-16Fixed small one-time memory leaks.Aura Linden
2012-12-14BOOL vs bool FIGHTAura Linden
2012-12-14merge changes for DRTVWR-224Oz Linden
2012-12-14tag merge of DRTVWR-224Oz Linden
2012-12-13Fixes from Oz's merge.Aura 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
This is the real viewer-side work that was the motivation for MAINT-2123. Reviewed with Bao.
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13Added tag 3.4.3-beta3 for changeset 870e2d79e006Oz Linden
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13tag merge of DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-13tag merge of DRTVWR-244Oz Linden
2012-12-13Fixed whitespace issues for merge.Aura Linden
2012-12-13merge changes for DRTVWR-266Oz Linden
2012-12-13tag merge of DRTVWR-266Oz Linden