Merge remote-tracking branch 'secondlife/release/2026.01' into 2026.01

24 files changed, 86 insertions, 92 deletions

diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h
index 3631965837..58affcb796 100644
--- a/indra/llcorehttp/_httplibcurl.h
+++ b/indra/llcorehttp/_httplibcurl.h
@@ -61,8 +61,8 @@ public:
     virtual ~HttpLibcurl();
 
 private:
-    HttpLibcurl(const HttpLibcurl &);           // Not defined
-    void operator=(const HttpLibcurl &);        // Not defined
+    HttpLibcurl(const HttpLibcurl&) = delete;
+    void operator=(const HttpLibcurl&) = delete;
 
 public:
     typedef std::shared_ptr<HttpOpRequest> opReqPtr_t;
@@ -179,8 +179,8 @@ protected:
         ~HandleCache();
 
     private:
-        HandleCache(const HandleCache &);               // Not defined
-        void operator=(const HandleCache &);            // Not defined
+        HandleCache(const HandleCache&)    = delete;
+        void operator=(const HandleCache&) = delete;
 
     public:
         /// Allocate a curl handle for caller.  May be freed using
diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h
index ff7efe60e9..8412043aa5 100644
--- a/indra/llcorehttp/_httpoperation.h
+++ b/indra/llcorehttp/_httpoperation.h
@@ -68,8 +68,7 @@ class HttpService;
 /// via queue-like interfaces that are thread compatible
 /// and those interfaces establish the access rules.
 
-class HttpOperation : private boost::noncopyable,
-    public std::enable_shared_from_this<HttpOperation>
+class HttpOperation : public std::enable_shared_from_this<HttpOperation>
 {
 public:
     typedef std::shared_ptr<HttpOperation> ptr_t;
@@ -82,6 +81,9 @@ public:
     /// Threading:  called by any thread.
     virtual ~HttpOperation();                           // Use release()
 
+    // Non-copyable
+    HttpOperation(const HttpOperation&) = delete;
+    HttpOperation& operator=(const HttpOperation&) = delete;
 
 public:
     /// Register a reply queue and a handler for completion notifications.
@@ -220,12 +222,10 @@ class HttpOpStop : public HttpOperation
 {
 public:
     HttpOpStop();
-
     virtual ~HttpOpStop();
 
-private:
-    HttpOpStop(const HttpOpStop &);                 // Not defined
-    void operator=(const HttpOpStop &);             // Not defined
+    HttpOpStop(const HttpOpStop &) = delete;
+    HttpOpStop& operator=(const HttpOpStop&) = delete;
 
 public:
     virtual void stageFromRequest(HttpService *);
@@ -242,12 +242,10 @@ class HttpOpNull : public HttpOperation
 {
 public:
     HttpOpNull();
-
     virtual ~HttpOpNull();
 
-private:
-    HttpOpNull(const HttpOpNull &);                 // Not defined
-    void operator=(const HttpOpNull &);             // Not defined
+    HttpOpNull(const HttpOpNull&) = delete;
+    HttpOpNull& operator=(const HttpOpNull&) = delete;
 
 public:
     virtual void stageFromRequest(HttpService *);
@@ -264,12 +262,10 @@ public:
     // 0 does a hard spin in the operation
     // 1 does a soft spin continuously requeuing itself
     HttpOpSpin(int mode);
-
     virtual ~HttpOpSpin();
 
-private:
-    HttpOpSpin(const HttpOpSpin &);                 // Not defined
-    void operator=(const HttpOpSpin &);             // Not defined
+    HttpOpSpin(const HttpOpSpin&) = delete;
+    HttpOpSpin& operator=(const HttpOpSpin&) = delete;
 
 public:
     virtual void stageFromRequest(HttpService *);
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index bde1aed910..bbf39c2afa 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -153,7 +153,7 @@ HttpOpRequest::HttpOpRequest()
       mPolicyRetryLimit(HTTP_RETRY_COUNT_DEFAULT),
       mPolicyMinRetryBackoff(HttpTime(HTTP_RETRY_BACKOFF_MIN_DEFAULT)),
       mPolicyMaxRetryBackoff(HttpTime(HTTP_RETRY_BACKOFF_MAX_DEFAULT)),
-      mCallbackSSLVerify(NULL)
+      mCallbackSSLVerify(nullptr)
 {
     // *NOTE:  As members are added, retry initialization/cleanup
     // may need to be extended in @see prepareRequest().
@@ -272,7 +272,7 @@ void HttpOpRequest::visitNotifier(HttpRequest * request)
         response->setContentType(mReplyConType);
         response->setRetries(mPolicyRetries, mPolicy503Retries);
 
-        HttpResponse::TransferStats::ptr_t stats = HttpResponse::TransferStats::ptr_t(new HttpResponse::TransferStats);
+        HttpResponse::TransferStats::ptr_t stats = std::make_shared<HttpResponse::TransferStats>();
 
         curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD, &stats->mSizeDownload);
         curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &stats->mTotalTime);
@@ -968,7 +968,7 @@ size_t HttpOpRequest::headerCallback(void * data, size_t size, size_t nmemb, voi
         // Save headers in response
         if (! op->mReplyHeaders)
         {
-            op->mReplyHeaders = HttpHeaders::ptr_t(new HttpHeaders);
+            op->mReplyHeaders = std::make_shared<HttpHeaders>();
         }
         op->mReplyHeaders->append(name, value ? value : "");
     }
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index b029bc740c..717535555c 100644
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -73,8 +73,8 @@ public:
     virtual ~HttpOpRequest();                           // Use release()
 
 private:
-    HttpOpRequest(const HttpOpRequest &);               // Not defined
-    void operator=(const HttpOpRequest &);              // Not defined
+    HttpOpRequest(const HttpOpRequest&)  = delete;
+    void operator=(const HttpOpRequest&) = delete;
 
 public:
     enum EMethod
diff --git a/indra/llcorehttp/_httpopsetget.h b/indra/llcorehttp/_httpopsetget.h
index 0b927a6b71..ff8204547b 100644
--- a/indra/llcorehttp/_httpopsetget.h
+++ b/indra/llcorehttp/_httpopsetget.h
@@ -60,8 +60,8 @@ public:
     virtual ~HttpOpSetGet();                            // Use release()
 
 private:
-    HttpOpSetGet(const HttpOpSetGet &);                 // Not defined
-    void operator=(const HttpOpSetGet &);               // Not defined
+    HttpOpSetGet(const HttpOpSetGet&)   = delete;
+    void operator=(const HttpOpSetGet&) = delete;
 
 public:
     /// Threading:  called by application thread
diff --git a/indra/llcorehttp/_httppolicy.h b/indra/llcorehttp/_httppolicy.h
index a074949f20..82f552176e 100644
--- a/indra/llcorehttp/_httppolicy.h
+++ b/indra/llcorehttp/_httppolicy.h
@@ -56,8 +56,8 @@ public:
     virtual ~HttpPolicy();
 
 private:
-    HttpPolicy(const HttpPolicy &);             // Not defined
-    void operator=(const HttpPolicy &);         // Not defined
+    HttpPolicy(const HttpPolicy&) = delete;
+    void operator=(const HttpPolicy&) = delete;
 
 public:
     typedef std::shared_ptr<HttpOpRequest> opReqPtr_t;
diff --git a/indra/llcorehttp/_httppolicyclass.h b/indra/llcorehttp/_httppolicyclass.h
index 32bcad4f9c..5bf0fa1fa7 100644
--- a/indra/llcorehttp/_httppolicyclass.h
+++ b/indra/llcorehttp/_httppolicyclass.h
@@ -53,7 +53,7 @@ public:
     ~HttpPolicyClass();
 
     HttpPolicyClass & operator=(const HttpPolicyClass &);
-    HttpPolicyClass(const HttpPolicyClass &);           // Not defined
+    HttpPolicyClass(const HttpPolicyClass &);
 
 public:
     HttpStatus set(HttpRequest::EPolicyOption opt, long value);
diff --git a/indra/llcorehttp/_httppolicyglobal.h b/indra/llcorehttp/_httppolicyglobal.h
index d9114d167f..3840d66b22 100644
--- a/indra/llcorehttp/_httppolicyglobal.h
+++ b/indra/llcorehttp/_httppolicyglobal.h
@@ -55,7 +55,7 @@ public:
     HttpPolicyGlobal & operator=(const HttpPolicyGlobal &);
 
 private:
-    HttpPolicyGlobal(const HttpPolicyGlobal &);         // Not defined
+    HttpPolicyGlobal(const HttpPolicyGlobal &) = delete;
 
 public:
     HttpStatus set(HttpRequest::EPolicyOption opt, long value);
diff --git a/indra/llcorehttp/_httpreadyqueue.h b/indra/llcorehttp/_httpreadyqueue.h
index 0bc0723511..04fcf25356 100644
--- a/indra/llcorehttp/_httpreadyqueue.h
+++ b/indra/llcorehttp/_httpreadyqueue.h
@@ -77,8 +77,8 @@ public:
         {}
 
 protected:
-    HttpReadyQueue(const HttpReadyQueue &);     // Not defined
-    void operator=(const HttpReadyQueue &);     // Not defined
+    HttpReadyQueue(const HttpReadyQueue&) = delete;
+    void operator=(const HttpReadyQueue&) = delete;
 
 public:
 
diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h
index d8847fafb5..e1b5648691 100644
--- a/indra/llcorehttp/_httpreplyqueue.h
+++ b/indra/llcorehttp/_httpreplyqueue.h
@@ -30,8 +30,6 @@
 
 #include "_refcounted.h"
 #include "_mutex.h"
-#include "boost/noncopyable.hpp"
-
 
 namespace LLCore
 {
@@ -59,7 +57,7 @@ class HttpOperation;
 /// will be coded anyway so it shouldn't be too much of a
 /// burden.
 
-class HttpReplyQueue : private boost::noncopyable
+class HttpReplyQueue
 {
 
 public:
@@ -69,6 +67,9 @@ public:
     HttpReplyQueue();
     virtual ~HttpReplyQueue();
 
+    HttpReplyQueue(const HttpReplyQueue&) = delete;
+    HttpReplyQueue& operator=(const HttpReplyQueue&) = delete;
+
 public:
 
     typedef std::vector< opPtr_t > OpContainer;
diff --git a/indra/llcorehttp/_httprequestqueue.h b/indra/llcorehttp/_httprequestqueue.h
index 0823126f78..82537c9053 100644
--- a/indra/llcorehttp/_httprequestqueue.h
+++ b/indra/llcorehttp/_httprequestqueue.h
@@ -57,8 +57,8 @@ protected:
     virtual ~HttpRequestQueue();                        // Use release()
 
 private:
-    HttpRequestQueue(const HttpRequestQueue &);         // Not defined
-    void operator=(const HttpRequestQueue &);           // Not defined
+    HttpRequestQueue(const HttpRequestQueue&) = delete;
+    void operator=(const HttpRequestQueue&)   = delete;
 
 public:
     typedef std::shared_ptr<HttpOperation> opPtr_t;
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp
index 5880fb7e87..a8660decc3 100644
--- a/indra/llcorehttp/_httpservice.cpp
+++ b/indra/llcorehttp/_httpservice.cpp
@@ -27,7 +27,6 @@
 #include "_httpservice.h"
 
 #include <boost/bind.hpp>
-#include <boost/function.hpp>
 
 #include "_httpoperation.h"
 #include "_httprequestqueue.h"
diff --git a/indra/llcorehttp/_httpservice.h b/indra/llcorehttp/_httpservice.h
index 13eb034f0e..7202b496fc 100644
--- a/indra/llcorehttp/_httpservice.h
+++ b/indra/llcorehttp/_httpservice.h
@@ -86,8 +86,8 @@ protected:
     virtual ~HttpService();
 
 private:
-    HttpService(const HttpService &);           // Not defined
-    void operator=(const HttpService &);        // Not defined
+    HttpService(const HttpService&) = delete;
+    void operator=(const HttpService&) = delete;
 
 public:
     enum EState
diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h
index 7470965a7f..63684b5e2c 100644
--- a/indra/llcorehttp/_refcounted.h
+++ b/indra/llcorehttp/_refcounted.h
@@ -31,12 +31,9 @@
 #include "linden_common.h"
 
 #include "fix_macros.h"
-#include <boost/thread.hpp>
 #include <boost/intrusive_ptr.hpp>
-
 #include "llatomic.h"
 
-
 namespace LLCoreInt
 {
 
@@ -44,8 +41,9 @@ namespace LLCoreInt
 class RefCounted
 {
 private:
-    RefCounted();                               // Not defined - may not be default constructed
-    void operator=(const RefCounted &);         // Not defined
+    RefCounted() = delete; // may not be default constructed
+    RefCounted(const RefCounted&) = delete;
+    RefCounted& operator=(const RefCounted&) = delete;
 
 public:
     explicit RefCounted(bool const implicit)
diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h
index 6c0e39cf92..93efbbedbc 100644
--- a/indra/llcorehttp/_thread.h
+++ b/indra/llcorehttp/_thread.h
@@ -42,8 +42,10 @@ namespace LLCoreInt
 class HttpThread : public RefCounted
 {
 private:
-    HttpThread();                           // Not defined
-    void operator=(const HttpThread &);     // Not defined
+    // May not be default constructed or copied
+    HttpThread() = delete;
+    HttpThread(const HttpThread&) = delete;
+    void operator=(const HttpThread &) = delete;
 
     void at_exit()
         {
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index 6b33661d8f..46c03f991d 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -57,12 +57,12 @@ public:
     void operator delete(void *);
     void operator delete(void *, size_t len);
 
+    Block(const Block&) = delete;
+    Block& operator=(const Block&) = delete;
+
 protected:
     Block(size_t len);
 
-    Block(const Block &);                       // Not defined
-    void operator=(const Block &);              // Not defined
-
     // Allocate the block with the additional space for the
     // buffered data at the end of the object.
     void * operator new(size_t len, size_t addl_len);
diff --git a/indra/llcorehttp/bufferarray.h b/indra/llcorehttp/bufferarray.h
index 5105dbc4f7..9abe1778ed 100644
--- a/indra/llcorehttp/bufferarray.h
+++ b/indra/llcorehttp/bufferarray.h
@@ -79,8 +79,8 @@ protected:
     virtual ~BufferArray();                     // Use release()
 
 private:
-    BufferArray(const BufferArray &);           // Not defined
-    void operator=(const BufferArray &);        // Not defined
+    BufferArray(const BufferArray&) = delete;
+    void operator=(const BufferArray&) = delete;
 
 public:
     // Internal magic number, may be used by unit tests.
diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h
index 93891810aa..ba84821df3 100644
--- a/indra/llcorehttp/bufferstream.h
+++ b/indra/llcorehttp/bufferstream.h
@@ -91,8 +91,8 @@ public:
     virtual ~BufferArrayStreamBuf();
 
 private:
-    BufferArrayStreamBuf(const BufferArrayStreamBuf &); // Not defined
-    void operator=(const BufferArrayStreamBuf &);       // Not defined
+    BufferArrayStreamBuf(const BufferArrayStreamBuf&) = delete;
+    void operator=(const BufferArrayStreamBuf&) = delete;
 
 public:
     // Input interfaces from std::streambuf
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 511a17e000..1c003a0966 100644
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -191,7 +191,6 @@
 #include "llsd.h"
 #include <string>
 #include <curl/curl.h>
-#include "boost/noncopyable.hpp"
 
 namespace LLCore
 {
@@ -297,25 +296,25 @@ struct HttpStatus
 
     HttpStatus()
     {
-        mDetails = std::shared_ptr<Details>(new Details(LLCORE, HE_SUCCESS));
+        mDetails = std::make_shared<Details>(LLCORE, HE_SUCCESS);
     }
 
     HttpStatus(type_enum_t type, short status)
     {
-        mDetails = std::shared_ptr<Details>(new Details(type, status));
+        mDetails = std::make_shared<Details>(type, status);
     }
 
     HttpStatus(int http_status)
     {
-        mDetails = std::shared_ptr<Details>(new Details(http_status,
-            (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR));
+        mDetails = std::make_shared<Details>(http_status,
+            (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR);
         llassert(http_status >= 100 && http_status <= 999);
     }
 
     HttpStatus(int http_status, const std::string &message)
     {
-        mDetails = std::shared_ptr<Details>(new Details(http_status,
-            (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR));
+        mDetails = std::make_shared<Details>(http_status,
+            (http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR);
         llassert(http_status >= 100 && http_status <= 999);
         mDetails->mMessage = message;
     }
@@ -337,7 +336,7 @@ struct HttpStatus
 
     HttpStatus & clone(const HttpStatus &rhs)
     {
-        mDetails = std::shared_ptr<Details>(new Details(*rhs.mDetails));
+        mDetails = std::make_shared<Details>(*rhs.mDetails);
         return *this;
     }
 
diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h
index a5ca7749b0..6a03cf4083 100644
--- a/indra/llcorehttp/httpheaders.h
+++ b/indra/llcorehttp/httpheaders.h
@@ -74,7 +74,7 @@ namespace LLCore
 /// constructor is given a refcount.
 ///
 
-class HttpHeaders: private boost::noncopyable
+class HttpHeaders
 {
 public:
     typedef std::pair<std::string, std::string> header_t;
@@ -94,11 +94,11 @@ public:
     HttpHeaders();
     virtual ~HttpHeaders();                     // Use release()
 
-    //typedef LLCoreInt::IntrusivePtr<HttpHeaders> ptr_t;
-protected:
+    // Non-copyable
+    HttpHeaders(const HttpHeaders&) = delete;
+    HttpHeaders& operator=(const HttpHeaders&) = delete;
 
-    HttpHeaders(const HttpHeaders &);           // Not defined
-    void operator=(const HttpHeaders &);        // Not defined
+    //typedef LLCoreInt::IntrusivePtr<HttpHeaders> ptr_t;
 
 public:
     // Empty the list of headers.
diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
index fdb277c66e..d50c5470ae 100644
--- a/indra/llcorehttp/httpoptions.h
+++ b/indra/llcorehttp/httpoptions.h
@@ -55,7 +55,7 @@ namespace LLCore
 /// Allocation:  Refcounted, heap only.  Caller of the constructor
 /// is given a refcount.
 ///
-class HttpOptions : private boost::noncopyable
+class HttpOptions
 {
 public:
     HttpOptions();
@@ -64,10 +64,9 @@ public:
 
     virtual ~HttpOptions();                     // Use release()
 
-protected:
-
-    HttpOptions(const HttpOptions &);           // Not defined
-    void operator=(const HttpOptions &);        // Not defined
+    // Non-copyable
+    HttpOptions(const HttpOptions&) = delete;
+    HttpOptions& operator=(const HttpOptions&) = delete;
 
 public:
 
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
     {
diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h
index e6e051410e..f7516f127a 100644
--- a/indra/llcorehttp/httprequest.h
+++ b/indra/llcorehttp/httprequest.h
@@ -104,9 +104,9 @@ public:
 
     /// Represents a default, catch-all policy class that guarantees
     /// eventual service for any HTTP request.
-    static const policy_t DEFAULT_POLICY_ID = 0;
-    static const policy_t INVALID_POLICY_ID = 0xFFFFFFFFU;
-    static const policy_t GLOBAL_POLICY_ID = 0xFFFFFFFEU;
+    static constexpr policy_t DEFAULT_POLICY_ID = 0;
+    static constexpr policy_t INVALID_POLICY_ID = 0xFFFFFFFFU;
+    static constexpr policy_t GLOBAL_POLICY_ID = 0xFFFFFFFEU;
 
     /// Create a new policy class into which requests can be made.
     ///
@@ -237,7 +237,7 @@ public:
 
     /// Prototype for policy based callbacks.  The callback methods will be executed
     /// on the worker thread so no modifications should be made to the HttpHandler object.
-    typedef boost::function<HttpStatus(const std::string &, const HttpHandler::ptr_t &, void *)> policyCallback_t;
+    typedef std::function<HttpStatus(const std::string &, const HttpHandler::ptr_t &, void *)> policyCallback_t;
 
     /// Set a policy option for a global or class parameter at
     /// startup time (prior to thread start).
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
index 99c8f1d2f9..ed2d76c10f 100644
--- a/indra/llcorehttp/httpresponse.h
+++ b/indra/llcorehttp/httpresponse.h
@@ -65,8 +65,8 @@ public:
 protected:
     virtual ~HttpResponse();                            // Use release()
 
-    HttpResponse(const HttpResponse &);                 // Not defined
-    void operator=(const HttpResponse &);               // Not defined
+    HttpResponse(const HttpResponse&) = delete;
+    void operator=(const HttpResponse&) = delete;
 
 public:
     /// Statistics for the HTTP