diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
| commit | 11c428759e0b99fc34e219181d81d024b0323b4d (patch) | |
| tree | e6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/llcommon/llcommon.cpp | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
| parent | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
| -rwxr-xr-x | 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 100755 --- 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); } |