Merge pull request #5097 from secondlife/release/2026.01

2026.01

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index 83a6e66019..50236587ac 100644
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -172,9 +172,9 @@ LLMediaDataClient::LLMediaDataClient(F32 queue_timer_delay, F32 retry_timer_dela
     mMaxSortedQueueSize(max_sorted_queue_size),
     mMaxRoundRobinQueueSize(max_round_robin_queue_size),
     mQueueTimerIsRunning(false),
-    mHttpRequest(new LLCore::HttpRequest()),
-    mHttpHeaders(new LLCore::HttpHeaders()),
-    mHttpOpts(new LLCore::HttpOptions()),
+    mHttpRequest(std::make_shared<LLCore::HttpRequest>()),
+    mHttpHeaders(std::make_shared<LLCore::HttpHeaders>()),
+    mHttpOpts(std::make_shared<LLCore::HttpOptions>()),
     mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID)
 {
     // *TODO: Look up real Policy ID
@@ -660,7 +660,7 @@ void LLMediaDataClient::Handler::onFailure(LLCore::HttpResponse * response, LLCo
 void LLObjectMediaDataClient::fetchMedia(LLMediaDataClientObject *object)
 {
     // Create a get request and put it in the queue.
-    enqueue(Request::ptr_t(new RequestGet(object, this)));
+    enqueue(std::make_shared<RequestGet>(object, this));
 }
 
 const char *LLObjectMediaDataClient::getCapabilityName() const
@@ -880,14 +880,14 @@ LLSD LLObjectMediaDataClient::RequestGet::getPayload() const
 
 LLCore::HttpHandler::ptr_t LLObjectMediaDataClient::RequestGet::createHandler()
 {
-    return LLCore::HttpHandler::ptr_t(new LLObjectMediaDataClient::Handler(shared_from_this()));
+    return std::make_shared<LLObjectMediaDataClient::Handler>(shared_from_this());
 }
 
 
 void LLObjectMediaDataClient::updateMedia(LLMediaDataClientObject *object)
 {
     // Create an update request and put it in the queue.
-    enqueue(Request::ptr_t(new RequestUpdate(object, this)));
+    enqueue(std::make_shared<RequestUpdate>(object, this));
 }
 
 LLObjectMediaDataClient::RequestUpdate::RequestUpdate(LLMediaDataClientObject *obj, LLMediaDataClient *mdc):
@@ -917,7 +917,7 @@ LLSD LLObjectMediaDataClient::RequestUpdate::getPayload() const
 LLCore::HttpHandler::ptr_t LLObjectMediaDataClient::RequestUpdate::createHandler()
 {
     // This just uses the base class's responder.
-    return LLCore::HttpHandler::ptr_t(new LLMediaDataClient::Handler(shared_from_this()));
+    return std::make_shared<LLMediaDataClient::Handler>(shared_from_this());
 }
 
 void LLObjectMediaDataClient::Handler::onSuccess(LLCore::HttpResponse * response, const LLSD &content)
@@ -1037,7 +1037,7 @@ void LLObjectMediaNavigateClient::navigate(LLMediaDataClientObject *object, U8 t
 //  LL_INFOS("LLMediaDataClient") << "navigate() initiated: " << ll_print_sd(sd_payload) << LL_ENDL;
 
     // Create a get request and put it in the queue.
-    enqueue(Request::ptr_t(new RequestNavigate(object, this, texture_index, url)));
+    enqueue(std::make_shared<RequestNavigate>(object, this, texture_index, url));
 }
 
 LLObjectMediaNavigateClient::RequestNavigate::RequestNavigate(LLMediaDataClientObject *obj, LLMediaDataClient *mdc, U8 texture_index, const std::string &url):
@@ -1058,7 +1058,7 @@ LLSD LLObjectMediaNavigateClient::RequestNavigate::getPayload() const
 
 LLCore::HttpHandler::ptr_t LLObjectMediaNavigateClient::RequestNavigate::createHandler()
 {
-    return LLCore::HttpHandler::ptr_t(new LLObjectMediaNavigateClient::Handler(shared_from_this()));
+    return std::make_shared<LLObjectMediaNavigateClient::Handler>(shared_from_this());
 }
 
 void LLObjectMediaNavigateClient::Handler::onSuccess(LLCore::HttpResponse * response, const LLSD &content)