From 2df95bb4bd63fe485f69ed7bdff5fb3fda6da9e6 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 17 Apr 2019 17:57:22 -0400 Subject: [PATCH] Floater About VLC support --- indra/newview/llfloaterabout.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index cc9628d2a..a08362714 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -71,6 +71,9 @@ #endif #include "cef/dullahan.h" +#if VLCPLUGIN +#include "vlc/libvlc_version.h" +#endif // LL_WINDOWS extern LLMemoryInfo gSysMemory; extern U32 gPacketsIn; @@ -295,9 +298,20 @@ LLFloaterAbout::LLFloaterAbout() << DULLAHAN_VERSION_BUILD << " / CEF: " << CEF_VERSION - << " / Chrome: " << CHROME_VERSION_MAJOR; + << " / Chrome: " << CHROME_VERSION_MAJOR + << '\n'; + +#if VLCPLUGIN + supportstrm << "LibVLC: "; + supportstrm << LIBVLC_VERSION_MAJOR; + supportstrm << '.'; + supportstrm << LIBVLC_VERSION_MINOR; + supportstrm << '.'; + supportstrm << LIBVLC_VERSION_REVISION; + supportstrm << '\n'; +#endif + support += supportstrm.str(); - support += '\n'; if (gPacketsIn > 0) {