Merge branch 'release/maint-b' into marchcat/b-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
#	indra/newview/llfilepicker.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 5857ee32e7..4e5013ec8f 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -981,6 +981,15 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable )
     sendMessage( message );
 }
 
+#if LL_LINUX
+void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable )
+{
+    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher");
+    message.setValueBoolean( "enable", enable );
+    sendMessage( message );
+}
+#endif
+
 void LLPluginClassMedia::setTarget(const std::string &target)
 {
     mTarget = target;