From a687ab04ae1d06120cc463706cc3bba7cb6aceb3 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 26 Oct 2023 08:42:45 +0800
Subject: Revert "OpenAL createDefaultStreamingAudioImpl stub"

This reverts commit b6574337ed3fd7749db6185501cd444305d44905.
---
 indra/llaudio/llaudioengine_openal.cpp | 5 -----
 indra/llaudio/llaudioengine_openal.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp
index bd262f253b..0a79614424 100644
--- a/indra/llaudio/llaudioengine_openal.cpp
+++ b/indra/llaudio/llaudioengine_openal.cpp
@@ -119,11 +119,6 @@ std::string LLAudioEngine_OpenAL::getDriverName(bool verbose)
 	return version.str();
 }
 
-LLStreamingAudioInterface *LLAudioEngine_OpenAL::createDefaultStreamingAudioImpl() const
-{
-	return NULL;
-}
-
 // virtual
 void LLAudioEngine_OpenAL::allocateListener()
 {
diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h
index 49ff484809..a3cab97cd2 100644
--- a/indra/llaudio/llaudioengine_openal.h
+++ b/indra/llaudio/llaudioengine_openal.h
@@ -42,7 +42,6 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
 
         virtual bool init(void *user_data, const std::string &app_title);
         virtual std::string getDriverName(bool verbose);
-        virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const;
 		virtual void allocateListener();
 
 		virtual void shutdown();
-- 
cgit v1.2.3


From a2456877583d66062c30a0906cacce941493abea Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 26 Oct 2023 08:44:18 +0800
Subject: Revert "Boost since 1.76 already internally includes v5"

This reverts commit 658ff1a0a14af93b96de22d3def56b93c0a5abd2.
---
 indra/newview/lllogchat.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 1dd6ac9339..ba82ff0b0f 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -41,9 +41,7 @@
 
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#ifndef LL_USESYSTEMLIBS
 #include <boost/regex/v4/match_results.hpp>
-#endif
 #include <boost/foreach.hpp>
 
 #if LL_MSVC
-- 
cgit v1.2.3