diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-07-21 21:32:27 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-07-21 21:32:27 +0800 |
commit | 790e708ffc1cb138a484249b3ac7f240be21dd98 (patch) | |
tree | 17ad9b813d718d47be2bbd8f8393677c5070f503 /indra/llplugin/llpluginclassmedia.cpp | |
parent | fe09a456ebc4c5db3e3dc10f26a3c64ca88428f7 (diff) | |
parent | 8f66fcb7e32ce074fda9816efec37b45659c45e3 (diff) |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 3c5d216938..453223b43e 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -33,7 +33,7 @@ #include "llpluginmessageclasses.h" #include "llcontrol.h" -#if LL_DARWIN || LL_LINUX +#if LL_DARWIN || LL_LINUX || __FreeBSD__ extern LLControlGroup gSavedSettings; #endif #if LL_DARWIN @@ -936,7 +936,7 @@ void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache message.setValue("username", username); // cef shares cache between users but creates user-based contexts message.setValue("cef_log_file", user_data_path_cef_log); -#if LL_DARWIN || LL_LINUX +#if LL_DARWIN || LL_LINUX || __FreeBSD__ bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog"); message.setValueBoolean("cef_verbose_log", cef_verbose_log); #endif |