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/newview/llappviewer.cpp | |
| parent | fe09a456ebc4c5db3e3dc10f26a3c64ca88428f7 (diff) | |
| parent | 8f66fcb7e32ce074fda9816efec37b45659c45e3 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 12c2740e64..f46580c6c0 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -132,7 +132,7 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -#if LL_DARWIN || LL_LINUX +#if LL_DARWIN || LL_LINUX || __FreeBSD__ #include "cef/dullahan_version.h" #endif #include "vlc/libvlc_version.h" @@ -3420,7 +3420,7 @@ LLSD LLAppViewer::getViewerInfo() const info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } -#if LL_DARWIN || LL_LINUX +#if LL_DARWIN || LL_LINUX || __FreeBSD__ std::ostringstream cef_ver_codec; cef_ver_codec << "Dullahan: "; cef_ver_codec << DULLAHAN_VERSION_MAJOR; |