summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-10 13:07:34 -0700
committercallum_linden <none@none>2016-05-10 13:07:34 -0700
commited73eae302d3178dd37163e74902fe149baa2c9c (patch)
tree794049c286ad9193472c62dadbdbc838a08d8f0e /indra/newview/llappviewer.cpp
parent337ad8a76f9e2d7aa61cb3a423fe3629070fe123 (diff)
Added support for arbitrary URLs and cleaned up code
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-xindra/newview/llappviewer.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 7393f633ea..85ff4030b6 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3346,18 +3346,18 @@ LLSD LLAppViewer::getViewerInfo() const
}
#if !LL_LINUX
- info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION;
+ std::ostringstream ver_codec;
+ ver_codec << LIBVLC_VERSION_MAJOR;
+ ver_codec << ".";
+ ver_codec << LIBVLC_VERSION_MINOR;
+ ver_codec << ".";
+ ver_codec << LIBVLC_VERSION_REVISION;
+ info["LIBVLC_VERSION"] = ver_codec.str();
- std::ostringstream s;
- s << "LibVLC ";
- s << LIBVLC_VERSION_MAJOR;
- s << ".";
- s << LIBVLC_VERSION_MINOR;
- s << ".";
- s << LIBVLC_VERSION_REVISION;
- info["LIBVLC_VERSION"] = s.str();
+ info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION;
#else
info["LLCEFLIB_VERSION"] = "Undefined";
+
info["LIBVLC_VERSION"] = "Undefined";
#endif