From 337ad8a76f9e2d7aa61cb3a423fe3629070fe123 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 9 May 2016 18:40:01 -0700
Subject: [PATCH] Add version info

---
 indra/newview/llappviewer.cpp                  | 11 +++++++++++
 indra/newview/skins/default/xui/en/strings.xml |  1 +
 2 files changed, 12 insertions(+)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 212627c0f7b..7393f633ea0 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 f2eddbb38ee..f292d195988 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>
-- 
GitLab