Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp

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>();
     }
 }