diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
| commit | 4c791e098d3abafa406e0e269038c40aae67f66c (patch) | |
| tree | d566be04939faf3dc29655a8113afc067b2b7c99 /indra/llcommon/llapr.cpp | |
| parent | c74dbc6e5b117bcd020c0efecf5255ad731f310f (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-596
Diffstat (limited to 'indra/llcommon/llapr.cpp')
| -rw-r--r-- | indra/llcommon/llapr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index e49f72722b..575c524219 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -38,6 +38,12 @@ const S32 FULL_VOLATILE_APR_POOL = 1024 ; //number of references to LLVolatileAP bool gAPRInitialized = false; +int abortfunc(int retcode) +{ + LL_WARNS("APR") << "Allocation failure in apr pool with code " << (S32)retcode << LL_ENDL; + return 0; +} + void ll_init_apr() { // Initialize APR and create the global pool @@ -45,7 +51,7 @@ void ll_init_apr() if (!gAPRPoolp) { - apr_pool_create(&gAPRPoolp, NULL); + apr_pool_create_ex(&gAPRPoolp, NULL, abortfunc, NULL); } if(!LLAPRFile::sAPRFilePoolp) |