Merge branch 'develop' into maxim/voice-moderation

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp
index 2aaf71f8a4..d8fcd6a03f 100644
--- a/indra/llcorehttp/httprequest.cpp
+++ b/indra/llcorehttp/httprequest.cpp
@@ -60,7 +60,7 @@ HttpRequest::HttpRequest()
     mRequestQueue = HttpRequestQueue::instanceOf();
     mRequestQueue->addRef();
 
-    mReplyQueue.reset( new HttpReplyQueue() );
+    mReplyQueue = std::make_shared<HttpReplyQueue>();
 
     HTTPStats::instance().recordHTTPRequest();
 }
@@ -129,7 +129,7 @@ HttpHandle HttpRequest::setPolicyOption(EPolicyOption opt, policy_t pclass,
 {
     HttpStatus status;
 
-    HttpOpSetGet::ptr_t op(new HttpOpSetGet());
+    HttpOpSetGet::ptr_t op = std::make_shared<HttpOpSetGet>();
     if (! (status = op->setupSet(opt, pclass, value)))
     {
         mLastReqStatus = status;
@@ -152,7 +152,7 @@ HttpHandle HttpRequest::setPolicyOption(EPolicyOption opt, policy_t pclass,
 {
     HttpStatus status;
 
-    HttpOpSetGet::ptr_t op (new HttpOpSetGet());
+    HttpOpSetGet::ptr_t op = std::make_shared<HttpOpSetGet>();
     if (! (status = op->setupSet(opt, pclass, value)))
     {
         mLastReqStatus = status;
@@ -190,7 +190,7 @@ HttpHandle HttpRequest::requestGet(policy_t policy_id,
     LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op(new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (! (status = op->setupGet(policy_id, url, options, headers)))
     {
         mLastReqStatus = status;
@@ -219,7 +219,7 @@ HttpHandle HttpRequest::requestGetByteRange(policy_t policy_id,
     LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op(new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (! (status = op->setupGetByteRange(policy_id, url, offset, len, options, headers)))
     {
         mLastReqStatus = status;
@@ -246,7 +246,7 @@ HttpHandle HttpRequest::requestPost(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op(new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (! (status = op->setupPost(policy_id, url, body, options, headers)))
     {
         mLastReqStatus = status;
@@ -273,7 +273,7 @@ HttpHandle HttpRequest::requestPut(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op (new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (! (status = op->setupPut(policy_id, url, body, options, headers)))
     {
         mLastReqStatus = status;
@@ -298,7 +298,7 @@ HttpHandle HttpRequest::requestDelete(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op(new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (!(status = op->setupDelete(policy_id, url, options, headers)))
     {
         mLastReqStatus = status;
@@ -324,7 +324,7 @@ HttpHandle HttpRequest::requestPatch(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op (new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (!(status = op->setupPatch(policy_id, url, body, options, headers)))
     {
         mLastReqStatus = status;
@@ -349,7 +349,7 @@ HttpHandle HttpRequest::requestCopy(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op(new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (!(status = op->setupCopy(policy_id, url, options, headers)))
     {
         mLastReqStatus = status;
@@ -375,7 +375,7 @@ HttpHandle HttpRequest::requestMove(policy_t policy_id,
 {
     HttpStatus status;
 
-    HttpOpRequest::ptr_t op (new HttpOpRequest());
+    HttpOpRequest::ptr_t op = std::make_shared<HttpOpRequest>();
     if (!(status = op->setupMove(policy_id, url, options, headers)))
     {
         mLastReqStatus = status;
@@ -397,7 +397,7 @@ HttpHandle HttpRequest::requestNoOp(HttpHandler::ptr_t user_handler)
 {
     HttpStatus status;
 
-    HttpOperation::ptr_t op (new HttpOpNull());
+    HttpOperation::ptr_t op = std::make_shared<HttpOpNull>();
     op->setReplyPath(mReplyQueue, user_handler);
     if (! (status = mRequestQueue->addOp(op)))          // transfers refcount
     {
@@ -463,7 +463,7 @@ HttpHandle HttpRequest::requestCancel(HttpHandle request, HttpHandler::ptr_t use
 {
     HttpStatus status;
 
-    HttpOperation::ptr_t op(new HttpOpCancel(request));
+    HttpOperation::ptr_t op = std::make_shared<HttpOpCancel>(request);
     op->setReplyPath(mReplyQueue, user_handler);
     if (! (status = mRequestQueue->addOp(op)))          // transfers refcount
     {
@@ -528,7 +528,7 @@ HttpHandle HttpRequest::requestStopThread(HttpHandler::ptr_t user_handler)
     HttpStatus status;
     HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID);
 
-    HttpOperation::ptr_t op(new HttpOpStop());
+    HttpOperation::ptr_t op = std::make_shared<HttpOpStop>();
     op->setReplyPath(mReplyQueue, user_handler);
     if (! (status = mRequestQueue->addOp(op)))          // transfers refcount
     {
@@ -548,7 +548,7 @@ HttpHandle HttpRequest::requestSpin(int mode)
     HttpStatus status;
     HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID);
 
-    HttpOperation::ptr_t op(new HttpOpSpin(mode));
+    HttpOperation::ptr_t op = std::make_shared<HttpOpSpin>(mode);
     op->setReplyPath(mReplyQueue, HttpHandler::ptr_t());
     if (! (status = mRequestQueue->addOp(op)))          // transfers refcount
     {