summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapr.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2025-12-03 22:28:01 +0200
committerGitHub <noreply@github.com>2025-12-03 22:28:01 +0200
commit189ffd46e0316e333bc850f69eb7ed57dd7829e7 (patch)
tree68fd14fac829ae5223919fa21d0ab580ad64af7b /indra/llcommon/llapr.cpp
parentb49400e0882a80dd2972a31cde2152ba979b2ce4 (diff)
parent1e1f96e8e406d9b56e7b9246b9999e92434656af (diff)
Merge pull request #5101 from secondlife/marchcat/devlinux-2601
Merge 26.01 into develop-linux
Diffstat (limited to 'indra/llcommon/llapr.cpp')
-rw-r--r--indra/llcommon/llapr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index ff5f262036..65ee383c6b 100644
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -154,7 +154,7 @@ LLVolatileAPRPool::LLVolatileAPRPool(bool is_local, apr_pool_t *parent, apr_size
//create mutex
if(!is_local) //not a local apr_pool, that is: shared by multiple threads.
{
- mMutexp.reset(new std::mutex());
+ mMutexp = std::make_unique<std::mutex>();
}
}