diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-14 22:04:37 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-14 22:04:37 +0200 |
| commit | 7fceb3a63f0157c7075c77e6d8516079ff4d217a (patch) | |
| tree | 19f23fe6dc1c2d396de32b32608352091ebda332 /indra/llcommon/llcommon.cpp | |
| parent | 6c7fabdec76eda60fa27640d115e06e2bbfc12e4 (diff) | |
| parent | c52f621e20737b553a9a9e7f1c961f5d5fbc6f89 (diff) | |
Merged in lindenlab/viewer-cleanup
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); } |