Merge branch 'release/2026.01' into maxim/2025.07-Flat-UI

1 files changed, 39 insertions, 4 deletions

diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 563dd9459c..0e5725baf3 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -53,7 +53,7 @@ static const U32 DEFAULT_POOL_SIZE = 5;
 const U32 LLCoprocedureManager::DEFAULT_QUEUE_SIZE = 1024*512;
 
 //=========================================================================
-class LLCoprocedurePool: private boost::noncopyable
+class LLCoprocedurePool
 {
 public:
     typedef LLCoprocedureManager::CoProcedure_t CoProcedure_t;
@@ -61,6 +61,10 @@ public:
     LLCoprocedurePool(const std::string &name, size_t size, size_t queue_size);
     ~LLCoprocedurePool();
 
+    // Non-copyable
+    LLCoprocedurePool(const LLCoprocedurePool&) = delete;
+    LLCoprocedurePool& operator=(const LLCoprocedurePool&) = delete;
+
     /// Places the coprocedure on the queue for processing.
     ///
     /// @param name Is used for debugging and should identify this coroutine.
@@ -138,7 +142,22 @@ LLCoprocedureManager::LLCoprocedureManager()
 
 LLCoprocedureManager::~LLCoprocedureManager()
 {
-    close();
+    try
+    {
+        close();
+    }
+    catch (const boost::fibers::fiber_error&)
+    {
+        LL_WARNS() << "Fiber error during ~LLCoprocedureManager()" << LL_ENDL;
+    }
+    catch (const std::exception& e)
+    {
+        // Shutting down, just log it
+        LL_WARNS() << "Exception during ~LLCoprocedureManager(): " << e.what() << LL_ENDL;
+    }
+    mPropertyQueryFn = nullptr;
+    mPropertyDefineFn = nullptr;
+    mPoolMap.clear();
 }
 
 void LLCoprocedureManager::initializePool(const std::string &poolName, size_t queue_size)
@@ -180,7 +199,7 @@ void LLCoprocedureManager::initializePool(const std::string &poolName, size_t qu
         LL_WARNS("CoProcMgr") << "LLCoprocedureManager: No setting for \"" << keyName << "\" setting pool size to default of " << size << LL_ENDL;
     }
 
-    poolPtr_t pool(new LLCoprocedurePool(poolName, size, queue_size));
+    poolPtr_t pool = std::make_shared<LLCoprocedurePool>(poolName, size, queue_size);
     LL_ERRS_IF(!pool, "CoprocedureManager") << "Unable to create pool named \"" << poolName << "\" FATAL!" << LL_ENDL;
 
     bool inserted = mPoolMap.emplace(poolName, pool).second;
@@ -350,7 +369,7 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size, s
 
     for (size_t count = 0; count < mPoolSize; ++count)
     {
-        LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter( mPoolName + "Adapter", mHTTPPolicy));
+        LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter = std::make_shared<LLCoreHttpUtil::HttpCoroutineAdapter>(mPoolName + "Adapter", mHTTPPolicy);
 
         std::string pooledCoro = LLCoros::instance().launch(
             "LLCoprocedurePool("+mPoolName+")::coprocedureInvokerCoro",
@@ -365,6 +384,22 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size, s
 
 LLCoprocedurePool::~LLCoprocedurePool()
 {
+    try
+    {
+        close(); // should have been closed already, but shouldn't hurt
+        mStatusListener.disconnect();
+        mPendingCoprocs.reset();
+        mCoroMapping.clear();
+    }
+    catch (const boost::fibers::fiber_error&)
+    {
+        LL_WARNS() << "Fiber error during ~LLCoprocedurePool() " << mPoolName << LL_ENDL;
+    }
+    catch (const std::exception& e)
+    {
+        // Shutting down, just log it
+        LL_WARNS() << "Exception " << e.what() << " during ~LLCoprocedurePool() in " << mPoolName << LL_ENDL;
+    }
 }
 
 //-------------------------------------------------------------------------