diff options
| author | callum_linden <none@none> | 2016-05-09 18:40:01 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-09 18:40:01 -0700 |
| commit | 337ad8a76f9e2d7aa61cb3a423fe3629070fe123 (patch) | |
| tree | aa4e052fdf505b9c45604c447f4fca68f2219c73 | |
| parent | d15da192311bbef38b27a07cf27bbf4e33b99b0b (diff) | |
Add version info
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 11 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 212627c0f7..7393f633ea 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 f2eddbb38e..f292d19598 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> |