diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-14 17:50:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-14 17:50:49 +0800 |
| commit | aafaba28c223681db8f9a4076193b167a91c4924 (patch) | |
| tree | e55789e95ccf837d8dd948286a4e1be3894a5d19 /indra/newview | |
| parent | 97a2176fc3bdff7085ed5c09e577159760972776 (diff) | |
| parent | 46273f40e8116a06bf7460903a1451e88ca2fad4 (diff) | |
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 28d08edec1..e2088e1a11 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2138,8 +2138,10 @@ if (DARWIN) if (USE_AUTOBUILD_3P OR USE_CONAN) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef) - else () + elseif (NOT DARWIN) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc) + else () + add_dependencies(${VIEWER_BINARY_NAME} SLPlugin) endif () if (ENABLE_SIGNING) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 90109e7a4c..84440d7b81 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -132,12 +132,12 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -//#if !LL_LINUX +#if !LL_DARWIN #ifndef LL_USESYSTEMLIBS #include "cef/dullahan_version.h" #endif #include "vlc/libvlc_version.h" -//#endif // LL_LINUX +#endif // LL_DARWIN #if LL_DARWIN #include "llwindowsdl.h" @@ -3393,7 +3393,7 @@ LLSD LLAppViewer::getViewerInfo() const info["LIBCEF_VERSION"] = "Undefined"; #endif -//#if !LL_LINUX +#if !LL_DARWIN std::ostringstream vlc_ver_codec; vlc_ver_codec << LIBVLC_VERSION_MAJOR; vlc_ver_codec << "."; @@ -3401,11 +3401,9 @@ LLSD LLAppViewer::getViewerInfo() const vlc_ver_codec << "."; vlc_ver_codec << LIBVLC_VERSION_REVISION; info["LIBVLC_VERSION"] = vlc_ver_codec.str(); -/* #else info["LIBVLC_VERSION"] = "Undefined"; #endif -*/ S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); if (packets_in > 0) |