diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-30 11:36:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-30 11:36:06 -0400 |
| commit | c92eb7e59198d37698c70b5e3be50503f5174cf3 (patch) | |
| tree | b8c55c54ccb097c84300e717bbbef5f63650751b /indra/llcommon/llcommon.cpp | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
| parent | 11c428759e0b99fc34e219181d81d024b0323b4d (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
| -rw-r--r-- | indra/llcommon/llcommon.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index 19642b0982..439ff4e628 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -31,6 +31,7 @@ #include "llthread.h" #include "lltrace.h" #include "lltracethreadrecorder.h" +#include "llcleanup.h" //static BOOL LLCommon::sAprInitialized = FALSE; @@ -63,11 +64,11 @@ void LLCommon::cleanupClass() sMasterThreadRecorder = NULL; LLTrace::set_master_thread_recorder(NULL); LLThreadSafeRefCount::cleanupThreadSafeRefCount(); - LLTimer::cleanupClass(); + SUBSYSTEM_CLEANUP(LLTimer); if (sAprInitialized) { ll_cleanup_apr(); sAprInitialized = FALSE; } - LLMemory::cleanupClass(); + SUBSYSTEM_CLEANUP(LLMemory); } |