diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
| commit | 09e953a3b7ead5ff5797be80d470b657c61234ea (patch) | |
| tree | ac6db282a64611f417a42f206733f3351f440918 /indra/llcommon/llcommon.cpp | |
| parent | 18083bad5cd1915a92e1650bc273db6a52100c6b (diff) | |
| parent | e4996c5d8182a0ef24f0eb445db82121fe5733d7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
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); } |