diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:58:24 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:58:24 +0200 |
commit | 15c62d9e713eb1d51cc063c4ec2fed1d1f4ca59c (patch) | |
tree | bbd0338a45d6fe58923f108399eaa6db91568420 /indra/llcommon/llcommon.cpp | |
parent | 4e808cfa852b873b484d0b9c90ab89ac196c3e52 (diff) | |
parent | 57a99273ed023bd71c54399969e66ffc23eebc57 (diff) |
Merged in lindenlab/viewer-bear
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); } |