Andrew Meadows
27bec2b2f2
yet more gcc fixes
2013-01-10 05:06:11 +00:00
Andrew Meadows
90b5937c74
gcc fixes
2013-01-10 04:19:16 +00:00
Andrew Meadows
8b836f776a
gcc fixes
2013-01-10 00:14:46 +00:00
Richard Linden
386e918583
SH-3468 WIP add memory tracking base class
...
fix for linux build issues
2013-01-09 11:21:45 -08:00
Richard Linden
0ba9a00c31
SH-3468 WIP add memory tracking base class
...
cleaned up hacks used to get unit tests working
LLTrace::init now supports recursive initialization/cleanup
put NOMINMAX back in win32 header wrappers
2013-01-08 23:50:27 -08:00
Richard Linden
2f91ffb45c
SH-3406 WIP convert fast timers to lltrace system
...
fixed Windows build problem (NOMINMAX redefinition)
2013-01-08 17:48:47 -08:00
Richard Linden
3c341a11ab
SH-3468 WIP add memory tracking base class
...
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
Richard Linden
6841351502
SH-3468 WIP add memory tracking base class
...
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
Richard Linden
222941d83c
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 20:40:21 -08:00
Richard Linden
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
Richard Linden
7dbb886037
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 16:19:20 -08:00
Richard Linden
cf8fa1a958
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 15:57:28 -08:00
Richard Linden
4ebd4b3616
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 14:09:02 -08:00
Richard Linden
cbff0e7ab8
SH-3468 WIP add memory tracking base class
...
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
Richard Linden
b2197101c4
SH-3468 WIP add memory tracking base class
...
fix for compile error on windows
ignore stdint.h even though VS2010 provides it
2013-01-04 13:04:09 -08:00
Oz Linden
0d12d171cf
pull back 3.4.4-beta4 tag
2013-01-04 14:15:08 -05:00
Oz Linden
fde976cf2b
Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95
2013-01-04 14:09:03 -05:00
Oz Linden
02d9734c45
merge back DRTVWR-275 from 3.4.4 beta
2013-01-04 10:12:04 -05:00
Andrew Meadows
019836a396
More fixes for linux build of lltrace changes
2013-01-04 03:02:54 +00:00
Oz Linden
def472b45c
tag merge of DRTVWR-275
2013-01-03 18:12:29 -05:00
Andrew Meadows
6e82bb7789
fixing linux compile errors for llcommon after LLTrace work
2013-01-03 22:34:34 +00:00
Kelly Washington
2cba564b24
MAINT-2184 [crashhunters] new crash in LLUUID::toString
...
Fix dangling references.
2013-01-03 09:17:25 -08:00
Richard Linden
cda2cdda51
SH-3406 WIP convert fast timers to lltrace system
...
made fast timer stack thread local
added LLThreadLocalSingleton
made LLThreadLocalPointer obey pointer rules for const
added LLThreadLocalSingletonPointer for fast thread local pointers
2013-01-03 00:30:54 -08:00
Oz Linden
cd1871d2e3
merge changes for DRTVWR-269
2013-01-02 10:15:33 -05:00
Oz Linden
55dfff68d4
tag merge of DRTVWR-269
2013-01-02 10:15:28 -05:00
Oz Linden
8c8d5ef924
merge changes for DRTVWR-272
2012-12-28 09:43:55 -05:00
Oz Linden
332eec9b70
tag merge of DRTVWR-272
2012-12-28 09:43:51 -05:00
Oz Linden
45492b81a0
merge changes for new Havok license
2012-12-27 13:45:17 -05: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
Richard Linden
3fd640a6e3
SH-3468 WIP add memory tracking base class
...
fixed crash on exit by making LLInstanceTracker iterators use atomic iterator
nesting count for thread safety
2012-12-23 12:27:25 -08:00
Oz Linden
b003ed1fd7
merge accidental commit and its fix
2012-12-21 11:28:16 -05:00
Nat Goodspeed
36f094d508
MAINT-2168: Backed out changeset fb93eecd462d, reapply fix
...
Now that we've backed out the premature push, reapply the actual fix to
propagate it appropriately.
2012-12-21 09:03:06 -05:00
Nat Goodspeed
144fcf62fb
MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repo
...
This changeset was prematurely pushed to the wrong repository. Back it out
to propagate it the right way.
2012-12-21 09:01:09 -05:00
Nat Goodspeed
747784a9b1
MAINT-2168: fail with real message if required var PORT not set.
...
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-21 08:52:39 -05:00
Richard Linden
013f04cabe
SH-3468 WIP add memory tracking base class
...
improvements on lifetime of lltrace core data structures
tweaks to thread local pointer handling so that static constructors/destructors
can safely call functions that use lltrace
2012-12-21 00:13:21 -08:00
Oz Linden
b6acda245c
merge changes for 3.4.4-beta3
2012-12-20 16:28:24 -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
ab23506eb1
merge changes for 3.4.4-beta2
2012-12-19 17:50:41 -05: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
Nat Goodspeed
c2e272577a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-19 08:10:50 -05:00
Nat Goodspeed
64e3352aa1
MAINT-1986: merge in TeamCity check in hashmap_test
2012-12-19 06:42:50 -05:00