From fe26a9d32c422fa26cfd82e92f93ad33654c2c51 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 30 Jul 2022 01:36:56 +0300 Subject: SL-17868 Crash at ThreadRecorder::bringUpToDate According to bugsplat get_thread_recorder was null Replaced apr based LLThreadLocalPointer with thread_local --- indra/llcommon/llapr.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llcommon/llapr.cpp') diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index db94765871..435531f86f 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -30,7 +30,6 @@ #include "llapr.h" #include "llmutex.h" #include "apr_dso.h" -#include "llthreadlocalstorage.h" apr_pool_t *gAPRPoolp = NULL; // Global APR memory pool LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool. @@ -54,7 +53,6 @@ void ll_init_apr() LLAPRFile::sAPRFilePoolp = new LLVolatileAPRPool(FALSE) ; } - LLThreadLocalPointerBase::initAllThreadLocalStorage(); gAPRInitialized = true; } @@ -70,8 +68,6 @@ void ll_cleanup_apr() LL_DEBUGS("APR") << "Cleaning up APR" << LL_ENDL; - LLThreadLocalPointerBase::destroyAllThreadLocalStorage(); - if (gAPRPoolp) { apr_pool_destroy(gAPRPoolp); -- cgit v1.2.3