diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 212627c0f7b585bdeff49b4ee11de12e7a1fb79e..7393f633ea0004c8834935b292b61e29671afce9 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -124,6 +124,7 @@ #include "llcoros.h" #if !LL_LINUX #include "cef/llceflib.h" +#include "vlc/libvlc_version.h" #endif // Third party library includes @@ -3346,8 +3347,18 @@ LLSD LLAppViewer::getViewerInfo() const #if !LL_LINUX info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION; + + std::ostringstream s; + s << "LibVLC "; + s << LIBVLC_VERSION_MAJOR; + s << "."; + s << LIBVLC_VERSION_MINOR; + s << "."; + s << LIBVLC_VERSION_REVISION; + info["LIBVLC_VERSION"] = s.str(); #else info["LLCEFLIB_VERSION"] = "Undefined"; + info["LIBVLC_VERSION"] = "Undefined"; #endif S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f2eddbb38ee385cdb96a6caff8e826fa12ebad0a..f292d195988eccbd1c1c51b7c4babb257e62abc8 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -51,6 +51,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] LLCEFLib/CEF Version: [LLCEFLIB_VERSION] +LibVLC Version: [LIBVLC_VERSION] Voice Server Version: [VOICE_VERSION] </string> <string name="AboutTraffic">Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)</string>