summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-28tag merge of DRTVWR-272Oz Linden
2012-12-27merge changes for new Havok licenseOz Linden
2012-12-25merge changes for DRTVWR-273Oz Linden
2012-12-25tag merge of DRTVWR-273Oz Linden
2012-12-21merge accidental commit and its fixOz Linden
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately.
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way.
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py, as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the environment variable PORT before running INTEGRATION_TEST_llhttpclient. While it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient could find PORT not set (getenv() returning NULL), it's obvious that in that case, the previous code might well crash. Make it at least fail with an explanatory message rather than a mysterious large negative integer. In theory, occurrences of that message could help us solve the underlying issue.
2012-12-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20Added tag 3.4.4-beta3 for changeset 2f8a3ef687bcOz Linden
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-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-18Switched mkTempDir back to using apple standard tempdir behavior instead of /tmpAura Linden
2012-12-18tag merge of DRTVWR-268Oz Linden
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-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
2012-12-13Removed tag 3.4.3-releaseOz Linden
2012-12-13merge changes for DRTVWR-265Oz Linden
2012-12-13tag merge of DRTVWR-265Oz Linden