Merge pull request #2450 from secondlife/lua-merge

Merge updated 'main' branch into release/luau-scripting

1 files changed, 3 insertions, 5 deletions

diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 14bdeb5c60..f1f3958fe0 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -115,7 +115,7 @@ void tracy_aligned_free(void *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;
     }
 }