diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-12-13 16:14:05 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-12-13 16:14:05 -0600 |
| commit | 9e7829c9cb140f994c9aa12dddcd4518c4c43a40 (patch) | |
| tree | 01a24506c244b875bdeb402498bf3cb11658debb /indra/llcommon/llapr.cpp | |
| parent | 5fcfe95422b4c3a5434b3eb711cd12401d4329d3 (diff) | |
| parent | a4397723b7ed1e5a8c86b104fd5a8b94da03abb9 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llcommon/llapr.cpp')
| -rw-r--r-- | indra/llcommon/llapr.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index b537102510..e49f72722b 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); |