summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapr.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-12-03 21:41:25 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2025-12-03 21:41:25 +0200
commitf57219efed141b5bc33dd9d08b03a48c6607fa33 (patch)
tree5744641957fe7ea94298228e4044d8c552a7dacb /indra/llcommon/llapr.cpp
parentb49400e0882a80dd2972a31cde2152ba979b2ce4 (diff)
parent6b866bc6432ef88a79a826c09b17107392bde15f (diff)
Merge branch 'release/2026.01' into marchcat/devlinux-2601
# Conflicts: # indra/llcommon/llprocessor.cpp # indra/llcorehttp/_refcounted.h # indra/llcorehttp/_thread.h # indra/newview/llfeaturemanager.cpp # indra/newview/llviewershadermgr.cpp
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>();
}
}