diff options
| author | Richard Linden <none@none> | 2013-01-06 21:37:31 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-06 21:37:31 -0800 |
| commit | 68413515029f50713c70e4adec3ce6fd1022d59f (patch) | |
| tree | 2f78acd9745ea4a10397ba360fb73e32c006509d /indra/llcommon/llapr.cpp | |
| parent | 222941d83c9a8e9fc1a488f0092f233b71a63db3 (diff) | |
SH-3468 WIP add memory tracking base class
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
Diffstat (limited to 'indra/llcommon/llapr.cpp')
| -rw-r--r-- | indra/llcommon/llapr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index d911f258b6..8a87911315 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -60,7 +60,7 @@ void ll_init_apr() } -void ll_cleanup_apr() +void ll_cleanup_apr(bool destroy_pools) { LL_INFOS("APR") << "Cleaning up APR" << LL_ENDL; @@ -83,7 +83,7 @@ void ll_cleanup_apr() LLThreadLocalPointerBase::destroyAllThreadLocalStorage(); - if (gAPRPoolp) + if (gAPRPoolp && destroy_pools) { apr_pool_destroy(gAPRPoolp); gAPRPoolp = NULL; |