diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 17:16:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 17:16:12 -0400 |
| commit | a4467e9ffe9dc378451d7bb6b8c70f6c0c42a814 (patch) | |
| tree | c6a918a0a3a0d7e1117ca71bfc966e3d6cd4b5ea /indra/llcommon/llcommon.cpp | |
| parent | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (diff) | |
| parent | 07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
| -rw-r--r-- | indra/llcommon/llcommon.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index 439ff4e628..2d665c611b 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -41,7 +41,6 @@ static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL; //static void LLCommon::initClass() { - LLMemory::initClass(); if (!sAprInitialized) { ll_init_apr(); @@ -70,5 +69,4 @@ void LLCommon::cleanupClass() ll_cleanup_apr(); sAprInitialized = FALSE; } - SUBSYSTEM_CLEANUP(LLMemory); } |