c1db961ab9
Fixed small one-time memory leaks.
2012-12-16 17:45:55 -08:00
5c9dd94e19
BOOL vs bool FIGHT
2012-12-14 21:41:02 +00:00
07dd6cf67e
merge changes for DRTVWR-224
2012-12-14 12:57:05 -05:00
d3293be2fe
tag merge of DRTVWR-224
2012-12-14 12:56:58 -05:00
3a72577f39
Fixes from Oz's merge.
2012-12-13 18:27:32 -08:00
a853a8cf20
merge
2012-12-13 15:46:08 -08:00
834a956a70
We now handle local_id=0 in KillObject as a prefix to deleted local_id's.
...
This is the real viewer-side work that was the motivation for MAINT-2123.
Reviewed with Bao.
2012-12-13 15:43:10 -08:00
83299b56c4
merge fixes from 3.4.3-beta3
2012-12-13 18:18:39 -05:00
9f1b484817
Added tag 3.4.3-beta3 for changeset 870e2d79e006
2012-12-13 18:10:21 -05:00
d0eff20718
merge changes for DRTVWR-267
2012-12-13 17:12:34 -05:00
b7ac7a0797
tag merge of DRTVWR-267
2012-12-13 17:12:31 -05:00
8e99b82645
merge changes for DRTVWR-244
2012-12-13 15:29:07 -05:00
e2bd5f7a9d
tag merge of DRTVWR-244
2012-12-13 15:29:01 -05:00
2282d6b11a
Fixed whitespace issues for merge.
2012-12-13 12:24:17 -08:00
c4c73fbcc6
merge changes for DRTVWR-266
2012-12-13 14:57:40 -05:00
35ef55b63f
tag merge of DRTVWR-266
2012-12-13 14:57:36 -05:00
874917106b
Removed tag 3.4.3-release
2012-12-13 14:38:18 -05:00
83a95325f8
merge changes for DRTVWR-265
2012-12-13 14:37:54 -05:00
ef07952d0d
tag merge of DRTVWR-265
2012-12-13 14:37:50 -05:00
00ebeaba58
Fix line endings.
2012-12-13 11:14:16 -08:00
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
739437e562
sync with viewer-development
2012-12-12 17:01:38 -08:00
716e2ea3b1
Pull and merge viewer-development
2012-12-12 10:58:47 -08:00
f2bf13b877
fix for SH-3622: crash on LLViewerRegion::updateVisibleEntries
2012-12-12 11:00:24 -07:00
773c4abc81
MAINT-2082: fix deletion of an autoreplace list
2012-12-12 10:53:13 -05:00
66fee67397
MAINT-2051: Implement replacement of an existing autoreplace list
2012-12-12 09:22:14 -05:00
e85e6ca410
Merged from viewer-release
2012-12-11 16:01:35 -08:00
6b059d183b
Crash reporter fixed, debugging removed.
2012-12-11 07:40:26 -08:00
53ea30af06
Interim debug checkin to test from teamcity
2012-12-11 06:56:14 -08:00
edcdce226a
merge changes for DRTVWR-260
2012-12-10 15:33:39 -05:00
d33ab2d3e0
tag merge of DRTVWR-260
2012-12-10 15:33:34 -05:00
a0d3781666
pull back release tags
2012-12-10 15:32:26 -05:00
a334f41f8e
Added tag 3.4.3-release for changeset 5cba5f39d0a8
2012-12-10 15:24:49 -05:00
623a06aabd
merge release tag
2012-12-10 15:24:08 -05:00
8c2e3bea71
SH-3406 WIP convert fast timers to lltrace system
...
added ability to query self time of block timers indepedently
2012-12-09 23:19:11 -08:00
b44c8593a3
SH-3406 WIP convert fast timers to lltrace system
...
further fixes for gcc builds
2012-12-07 19:00:13 -08:00
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
c8c14ac72d
SH-3406 WIP convert fast timers to lltrace system
...
potential fixes for gcc builds
2012-12-07 15:26:59 -08:00
c99886d943
SH-3406 WIP convert fast timers to lltrace system
...
improved unit tests for LLUnit
renamed LLUnit to LLUnitImplicit with LLUnit being reserved for
explicit units
2012-12-07 15:20:12 -08:00
b6a7c8fcfd
Merge in backed out changes.
2012-12-07 17:50:37 -05:00
954200e97f
Backed out changeset 69636bceb5a2.
2012-12-07 17:48:50 -05:00
77f58a7524
Backed out changeset 227671259809.
2012-12-07 17:48:10 -05:00
8aa32015a9
Backed out changeset 5cf865a7afa7
2012-12-07 17:47:03 -05:00
2b3bcdbcbb
Added compiled AutoUpdater.nib made from new AutoUpdater.xib
2012-12-06 21:01:39 -08:00
e21275f356
Fixed several minor issues with validation.
2012-12-06 21:00:37 -08:00
3745d1254a
SH-3406 WIP convert fast timers to lltrace system
...
added unit tests for LLUnit
2012-12-06 17:24:41 -08:00
2facd63745
SH-3406 WIP convert fast timers to lltrace system
...
improved LLUnit compile time errors
removed cassert in favor of llstatic_assert
2012-12-06 14:30:56 -08:00
60800dacdd
SH-3406 WIP convert fast timers to lltrace system
...
fixed gcc compile error
made LLCopyOnWritePointer contain an LLPointer, not derive from it
added type trait to control periodicrecording mean value type
2012-12-06 00:37:15 -08:00
b6bf90c042
merge changes for MAINT-1955
2012-12-05 22:15:08 -05:00
a9ada0cc6a
merge changes for DRTVWR-259
2012-12-05 20:08:32 -05:00
Aura Linden