diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-02 20:41:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-02 20:41:04 +0800 |
| commit | cbcc1f0623aaf13b55a6fd4ab5b0f663cd3651ed (patch) | |
| tree | 59cc526460bcddcb60da51aa9903a4e6444e4919 /indra/llplugin | |
| parent | b91449d4d92b2351188fbfad155459e8aa1a79b8 (diff) | |
| parent | df9b4d888e5f837e10bc9e358fe37cf2ac01d3ca (diff) | |
Merge branch 'main' into 26.3
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 2 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 9d99b2ffd5..6ab378f30f 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1016,7 +1016,7 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable ) sendMessage( message ); } -#if LL_LINUX +#if LL_LINUX || __FreeBSD__ void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable ) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher"); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 91901719d3..944108aa10 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -134,7 +134,7 @@ public: // Text may be unicode (utf8 encoded) bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data); -#if LL_LINUX +#if LL_LINUX || __FreeBSD__ void enablePipeWireVolumeCatcher( bool enable ); #endif |