1 files changed, 7 insertions, 9 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 14bdeb5c60..84b35749cc 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -54,7 +54,7 @@ void* ll_tracy_new(size_t size)
     {
         throw std::bad_alloc();
     }
-    TracyAlloc(ptr, size);
+    LL_PROFILE_ALLOC(ptr, size);
     return ptr;
 }
 
@@ -70,7 +70,7 @@ void* operator new[](std::size_t count)
 
 void ll_tracy_delete(void* ptr)
 {
-    TracyFree(ptr);
+    LL_PROFILE_FREE(ptr);
     if (gProfilerEnabled)
     {
         //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;
@@ -102,20 +102,20 @@ void operator delete[](void* ptr) noexcept
 void *tracy_aligned_malloc(size_t size, size_t alignment)
 {
     auto ptr = ll_aligned_malloc_fallback(size, alignment);
-    if (ptr) TracyAlloc(ptr, size);
+    if (ptr) LL_PROFILE_ALLOC(ptr, size);
     return ptr;
 }
 
 void tracy_aligned_free(void *memblock)
 {
-    TracyFree(memblock);
+    LL_PROFILE_FREE(memblock);
     ll_aligned_free_fallback(memblock);
 }
 
 #endif
 
 //static
-BOOL LLCommon::sAprInitialized = FALSE;
+bool LLCommon::sAprInitialized = false;
 
 static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;
 
@@ -125,10 +125,9 @@ void LLCommon::initClass()
     if (!sAprInitialized)
     {
         ll_init_apr();
-        sAprInitialized = TRUE;
+        sAprInitialized = true;
     }
     LLTimer::initClass();
-    LLThreadSafeRefCount::initThreadSafeRefCount();
     assert_main_thread();       // Make sure we record the main thread
     if (!sMasterThreadRecorder)
     {
@@ -143,11 +142,10 @@ void LLCommon::cleanupClass()
     delete sMasterThreadRecorder;
     sMasterThreadRecorder = NULL;
     LLTrace::set_master_thread_recorder(NULL);
-    LLThreadSafeRefCount::cleanupThreadSafeRefCount();
     SUBSYSTEM_CLEANUP_DBG(LLTimer);
     if (sAprInitialized)
     {
         ll_cleanup_apr();
-        sAprInitialized = FALSE;
+        sAprInitialized = false;
     }
 }