diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
| commit | 3c858d7e2d6633df14df473a918d2fb848403972 (patch) | |
| tree | 62b36692a0c1df2f34a85bc7fd4111afb2737d81 /indra/llcommon/llapr.cpp | |
| parent | 8b86e2ad1b1326cb3e98acd857dc93f4f1455b8c (diff) | |
| parent | 32de0cb67d824498d0fc9d489ce19731ebfddfdf (diff) | |
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
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) |