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

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index cc2d6566fc..0c71cfc415 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -31,9 +31,7 @@
 #include "llsdparam.h"
 #include "llexception.h"
 #include "apr_thread_proc.h"
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/optional.hpp>
-#include <boost/noncopyable.hpp>
 #include <iosfwd>                   // std::ostream
 
 #if LL_WINDOWS
@@ -67,7 +65,7 @@ typedef std::shared_ptr<LLProcess> LLProcessPtr;
  * indra/llcommon/tests/llprocess_test.cpp for an example of waiting for
  * child-process termination in a standalone test context.
  */
-class LL_COMMON_API LLProcess: public boost::noncopyable
+class LL_COMMON_API LLProcess
 {
     LOG_CLASS(LLProcess);
 public:
@@ -542,6 +540,10 @@ public:
     static std::string basename(const std::string& path);
     static std::string getline(std::istream&);
 
+    // Non-copyable
+    LLProcess(const LLProcess&) = delete;
+    LLProcess& operator=(const LLProcess&) = delete;
+
 private:
     /// constructor is private: use create() instead
     LLProcess(const LLSDOrParams& params);
@@ -564,7 +566,7 @@ private:
     bool mAutokill, mAttached;
     Status mStatus;
     // explicitly want this ptr_vector to be able to store NULLs
-    typedef boost::ptr_vector< boost::nullable<BasePipe> > PipeVector;
+    typedef std::vector<std::unique_ptr<BasePipe>> PipeVector;
     PipeVector mPipes;
     apr_pool_t* mPool;
 };