diff options
author | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:42:23 -0800 |
---|---|---|
committer | Anchor Linden <anchor@lindenlab.com> | 2018-02-28 22:42:23 -0800 |
commit | 618179a71722e47115a6b021a1eb2be99e46322f (patch) | |
tree | 7cb94aef6fe27ed0497790f07f8c190cf1944f92 /indra/llcommon/llcommon.cpp | |
parent | bfbcd6d16931819c43eea8e83963c9f86c6892dd (diff) | |
parent | 5a12a88f7b53bb99a6b302c35d891a8ecee59855 (diff) |
Merge
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); } |