Commit Graph

25305 Commits (d403499759717daccda5e72af8e6640bdbc49db5)

Author SHA1 Message Date
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
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
Oz Linden e2bd5f7a9d tag merge of DRTVWR-244 2012-12-13 15:29:01 -05:00
Aura Linden 2282d6b11a Fixed whitespace issues for merge. 2012-12-13 12:24:17 -08:00
Oz Linden c4c73fbcc6 merge changes for DRTVWR-266 2012-12-13 14:57:40 -05:00
Oz Linden 35ef55b63f tag merge of DRTVWR-266 2012-12-13 14:57:36 -05:00
Oz Linden 874917106b Removed tag 3.4.3-release 2012-12-13 14:38:18 -05:00
Oz Linden 83a95325f8 merge changes for DRTVWR-265 2012-12-13 14:37:54 -05:00
Oz Linden ef07952d0d tag merge of DRTVWR-265 2012-12-13 14:37:50 -05:00
Kelly Washington 00ebeaba58 Fix line endings. 2012-12-13 11:14:16 -08:00
Kelly Washington 70c6b08595 MAINT-1995 Names of banned and allowed residents are not shown in Access tab of the About Land dialog
Code by Richard, reviewed by merov and kelly
2012-12-13 08:44:22 -08:00
Oz Linden 773c4abc81 MAINT-2082: fix deletion of an autoreplace list 2012-12-12 10:53:13 -05:00
Oz Linden 66fee67397 MAINT-2051: Implement replacement of an existing autoreplace list 2012-12-12 09:22:14 -05:00
Aura Linden e85e6ca410 Merged from viewer-release 2012-12-11 16:01:35 -08:00
Aura Linden 6b059d183b Crash reporter fixed, debugging removed. 2012-12-11 07:40:26 -08:00
Aura Linden 53ea30af06 Interim debug checkin to test from teamcity 2012-12-11 06:56:14 -08:00
Oz Linden edcdce226a merge changes for DRTVWR-260 2012-12-10 15:33:39 -05:00
Oz Linden d33ab2d3e0 tag merge of DRTVWR-260 2012-12-10 15:33:34 -05:00
Oz Linden a0d3781666 pull back release tags 2012-12-10 15:32:26 -05:00
Oz Linden a334f41f8e Added tag 3.4.3-release for changeset 5cba5f39d0a8 2012-12-10 15:24:49 -05:00
Oz Linden 623a06aabd merge release tag 2012-12-10 15:24:08 -05:00
Logan Dethrow 7e59b10413 Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake. 2012-12-07 19:38:12 -05:00
Logan Dethrow b6a7c8fcfd Merge in backed out changes. 2012-12-07 17:50:37 -05:00
Logan Dethrow 954200e97f Backed out changeset 69636bceb5a2. 2012-12-07 17:48:50 -05:00
Logan Dethrow 77f58a7524 Backed out changeset 227671259809. 2012-12-07 17:48:10 -05:00
Logan Dethrow 8aa32015a9 Backed out changeset 5cf865a7afa7 2012-12-07 17:47:03 -05:00
Aura Linden 2b3bcdbcbb Added compiled AutoUpdater.nib made from new AutoUpdater.xib 2012-12-06 21:01:39 -08:00
Aura Linden e21275f356 Fixed several minor issues with validation. 2012-12-06 21:00:37 -08:00
Nat Goodspeed b6bf90c042 merge changes for MAINT-1955 2012-12-05 22:15:08 -05:00
Nat Goodspeed a9ada0cc6a merge changes for DRTVWR-259 2012-12-05 20:08:32 -05:00
Nat Goodspeed 168040bad2 tag merge of DRTVWR-259 2012-12-05 20:08:26 -05:00
Nat Goodspeed 4c384aa4ab merge changes for MAINT-1951 2012-12-05 20:07:25 -05:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Nat Goodspeed c5aeb0667f tag merge of DRTVWR-257 2012-12-05 18:18:12 -05:00
Nat Goodspeed 476f6a0990 merge changes for MAINT-1953 2012-12-05 18:17:00 -05:00
Nat Goodspeed 8a019b961b merge changes for DRTVWR-258 2012-12-05 16:02:59 -05:00
Nat Goodspeed ea98a58e36 tag merge of DRTVWR-258 2012-12-05 16:02:52 -05:00