summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/llappviewer.cpp10
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
3 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9fe89c1a19..129e436d5f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -48,6 +48,7 @@ include(OPENAL)
include(OpenGL)
include(OpenSSL)
include(PNG)
+include(SQLite)
include(TemplateCheck)
include(UI)
include(UnixInstall)
@@ -70,6 +71,7 @@ include_directories(
${DBUSGLIB_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIR}
${GLOD_INCLUDE_DIR}
+ ${SQLITE_INCLUDE_DIR}
${LLAUDIO_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index eca5aafa55..6181683b9e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -130,6 +130,7 @@
#if !LL_LINUX
#include "cef/dullahan_version.h"
#include "vlc/libvlc_version.h"
+#include "sqlite3.h"
#endif // LL_LINUX
// Third party library includes
@@ -3179,6 +3180,15 @@ LLSD LLAppViewer::getViewerInfo() const
#endif
#if !LL_LINUX
+ std::ostringstream sqlite_ver_codec;
+ sqlite_ver_codec << "SQLite: ";
+ sqlite_ver_codec << SQLITE_VERSION;
+ info["SQLITE_VERSION"] = sqlite_ver_codec.str();
+#else
+ info["SQLITE_VERSION"] = "Undefined";
+#endif
+
+#if !LL_LINUX
std::ostringstream vlc_ver_codec;
vlc_ver_codec << LIBVLC_VERSION_MAJOR;
vlc_ver_codec << ".";
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 03aed8aa7e..bca577c48a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -62,6 +62,7 @@ HiDPI display mode: [HIDPI]
<string name="AboutLibs">
J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION]
+[SQLITE_VERSION]
[LIBCEF_VERSION]
LibVLC Version: [LIBVLC_VERSION]
Voice Server Version: [VOICE_VERSION]