Commit Graph

25420 Commits (8a576ea16fe6f887458a2001ab9b0e5d2b41f58a)

Author SHA1 Message Date
Oz Linden 8a576ea16f remove prototype access code used for server testing 2013-01-16 17:28:30 -05:00
Oz Linden b3e10f0f49 pull 3.4.4-release tag 2013-01-11 10:13:56 -05:00
Oz Linden d16757545c Added tag 3.4.4-release for changeset e1bb1ae7d8b1 2013-01-09 18:19:24 -05:00
Oz Linden 896a2d3651 merge up to 3.4.4-beta4 2013-01-09 16:55:34 -05:00
Oz Linden 8b78b9960a add conditional to suppress unused variable warning in Release builds 2013-01-04 14:12:05 -05:00
Oz Linden fde976cf2b Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95 2013-01-04 14:09:03 -05:00
Oz Linden def472b45c tag merge of DRTVWR-275 2013-01-03 18:12:29 -05:00
Oz Linden 80b734575d merge up to 3.4.4-beta3, new havok license, and new boost and icu4c builds 2013-01-03 17:32:49 -05:00
Oz Linden 0b1d70fd71 whitespace change to force new codeticket 2013-01-03 16:36:39 -05:00
Oz Linden d4910e15a6 changes needed to compile with Linden-standard toolchain 2013-01-03 14:14:43 -05:00
Kelly Washington 2cba564b24 MAINT-2184 [crashhunters] new crash in LLUUID::toString
Fix dangling references.
2013-01-03 09:17:25 -08:00
Oz Linden 835660bbb2 merge changes for DRTVWR-273 2012-12-25 09:00:49 -05:00
Oz Linden 4364924ee4 tag merge of DRTVWR-273 2012-12-25 09:00:42 -05:00
Oz Linden 0baf43730b Added tag 3.4.4-beta3 for changeset 2f8a3ef687bc 2012-12-20 15:34:18 -05:00
Oz Linden e1497b1b39 merge changes for DRTVWR-271 2012-12-20 14:50:48 -05:00
Oz Linden a53323f328 tag merge of DRTVWR-271 2012-12-20 14:50:42 -05:00
Aura Linden e3fa3addd0 Reverted mac updater 2012-12-20 10:51:55 -08:00
Aura Linden 867d00c687 There goes a month of work 2012-12-20 09:16:16 -08:00
Oz Linden d8ac1c0f2f Added tag 3.4.4-beta2 for changeset cd39255bd233 2012-12-19 17:49:16 -05:00
Oz Linden 173213b986 merge changes for DRTVWR-270 2012-12-19 16:52:35 -05:00
Oz Linden 213be712b2 tag merge of DRTVWR-270 2012-12-19 16:52:25 -05:00
Oz Linden 1c7f19c865 change to use lindenlab repo for havok source, with new license 2012-12-19 09:45:28 -05:00
Oz Linden 0ed83541bf upgrade boost build to use public build of icu4c 2012-12-19 09:41:59 -05:00
Aura Linden a9a21ecffa Switched mkTempDir back to using apple standard tempdir behavior instead of /tmp 2012-12-18 13:30:21 -08:00
Kitty Barnett c309a7bd94 Merge with viewer-materials tip 2012-12-18 21:57:25 +01:00
Kitty Barnett ca790f7320 Bypass GCC template stumble by specializing getMaterialField for LLUUID 2012-12-18 21:52:41 +01:00
William Todd Stinson 3feacc96c6 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-12-18 11:00:13 -08:00
Oz Linden 00d6b19134 tag merge of DRTVWR-268 2012-12-18 10:32:19 -05:00
William Todd Stinson 4745afe679 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-12-17 18:16:06 -08:00
William Todd Stinson 3974d1eb9d Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-12-17 14:06:20 -08:00
William Todd Stinson 2e015caf26 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-12-17 13:31:47 -08:00
William Todd Stinson 6710b60b10 MAINT-2134: Removing llassert() calls that were causing problems with the 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-17 13:17:00 -08:00
Oz Linden 1be900c153 increment version to 3.4.5 2012-12-17 14:54:12 -05:00
Oz Linden 769336a72e Added tag 3.4.4-beta1 for changeset 083d2d36b5bb 2012-12-17 14:46:39 -05:00
Oz Linden d403499759 pull back 3.4.3-release tag 2012-12-17 14:46:27 -05:00
Oz Linden 2206653f2e Added tag 3.4.3-release for changeset 0a2ca6546b49 2012-12-17 14:44:26 -05:00
Oz Linden 36222cfa8c merge changes for DRTVWR-244 2012-12-17 10:15:01 -05:00
Oz Linden 7a6b073dca tag merge of DRTVWR-244 2012-12-17 10:14:32 -05:00
Aura Linden b6abf5c0ee Merged 2012-12-16 17:48:32 -08:00
Aura Linden c1db961ab9 Fixed small one-time memory leaks. 2012-12-16 17:45:55 -08:00
Kitty Barnett 5824e60c59 Merge with viewer-materials tip 2012-12-17 00:09:01 +01:00
Aura Linden 5c9dd94e19 BOOL vs bool FIGHT 2012-12-14 21:41:02 +00:00
Oz Linden 07dd6cf67e merge changes for DRTVWR-224 2012-12-14 12:57:05 -05:00
Oz Linden d3293be2fe tag merge of DRTVWR-224 2012-12-14 12:56:58 -05:00
Aura Linden 3a72577f39 Fixes from Oz's merge. 2012-12-13 18:27:32 -08:00
Oz Linden 83299b56c4 merge fixes from 3.4.3-beta3 2012-12-13 18:18:39 -05:00
Oz Linden 9f1b484817 Added tag 3.4.3-beta3 for changeset 870e2d79e006 2012-12-13 18:10:21 -05:00
Oz Linden d0eff20718 merge changes for DRTVWR-267 2012-12-13 17:12:34 -05:00
Oz Linden b7ac7a0797 tag merge of DRTVWR-267 2012-12-13 17:12:31 -05:00
Oz Linden 8e99b82645 merge changes for DRTVWR-244 2012-12-13 15:29:07 -05:00