Merge branch 'release/2026.01' into marchcat/devlinux-2601

# Conflicts:
#	indra/llcommon/llprocessor.cpp
#	indra/llcorehttp/_refcounted.h
#	indra/llcorehttp/_thread.h
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llviewershadermgr.cpp

2 files changed, 11 insertions, 9 deletions

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 02c7d9507d..4f55d75e7d 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -982,15 +982,18 @@ void LLPluginProcessParent::poll(F64 timeout)
         }
     }
 
-    // Remove instances in the done state from the sInstances map.
-    LLCoros::LockType lock(*sInstancesMutex);
-    mapInstances_t::iterator itClean = sInstances.begin();
-    while (itClean != sInstances.end())
+    if (sInstancesMutex)
     {
-        if ((*itClean).second->isDone())
-            itClean = sInstances.erase(itClean);
-        else
-            ++itClean;
+        // Remove instances in the done state from the sInstances map.
+        LLCoros::LockType lock(*sInstancesMutex);
+        mapInstances_t::iterator itClean = sInstances.begin();
+        while (itClean != sInstances.end())
+        {
+            if ((*itClean).second->isDone())
+                itClean = sInstances.erase(itClean);
+            else
+                ++itClean;
+        }
     }
 }
 
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 334f1411af..ea604ca8d7 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -30,7 +30,6 @@
 #define LL_LLPLUGINPROCESSPARENT_H
 
 #include <queue>
-#include <boost/enable_shared_from_this.hpp>
 
 #include "llapr.h"
 #include "llprocess.h"