From c637d4deb5222a0c2148dba1524bd5966cf1cb3c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 9 Mar 2021 23:58:53 -0500
Subject: [PATCH] Add more info to about floater
---
indra/newview/llappviewer.cpp | 18 ++++++++++++++++--
indra/newview/skins/default/xui/en/strings.xml | 4 ++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f6cfd62d6f0..4e63cfc4ad1 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3136,6 +3136,20 @@ LLSD LLAppViewer::getViewerInfo() const
}
info["VIEWER_RELEASE_NOTES_URL"] = url;
+#if LL_MSVC && !defined(LL_CLANG)
+ info["COMPILER"] = "MSVC";
+ info["COMPILER_VERSION"] = _MSC_FULL_VER;
+#elif LL_GNUC
+ info["COMPILER"] = "GCC";
+ info["COMPILER_VERSION"] = GCC_VERSION;
+#elif LL_CLANG
+ info["COMPILER"] = "Clang";
+ info["COMPILER_VERSION"] = __clang_version__;
+#elif LL_INTELC
+ info["COMPILER"] = "ICC";
+ info["COMPILER_VERSION"] = __ICC;
+#endif
+
// Position
LLViewerRegion* region = gAgent.getRegion();
if (region)
@@ -3214,7 +3228,7 @@ LLSD LLAppViewer::getViewerInfo() const
#endif
// Libraries
-
+ info["LIBCURL_VERSION"] = LLCore::LLHttp::getCURLVersion();
info["J2C_VERSION"] = LLImageJ2C::getEngineInfo();
bool want_fullname = true;
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined";
@@ -3230,7 +3244,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
}
-#if !LL_LINUX
+#if defined(CEF_VERSION)
std::ostringstream cef_ver_codec;
cef_ver_codec << "Dullahan: ";
cef_ver_codec << DULLAHAN_VERSION_MAJOR;
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d8b17da7667..da473bb9552 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -24,7 +24,10 @@
[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit)
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
+ <string name="AboutCompiler">Compiler Version: [COMPILER] [COMPILER_VERSION]</string>
+ <string name="AboutVCSRev">Git Revision: [GIT_REV]</string>
<string name="BuildConfig">Build Configuration [BUILD_CONFIG]</string>
+ <string name="BuildDate">Build Date: [BUILD_DATE] [BUILD_TIME]</string>
<string name="AboutPosition">
You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP])
@@ -68,6 +71,7 @@ HiDPI display mode: [HIDPI]
</string>
<string name="AboutLibs">
RestrainedLove API: [RLV_VERSION]
+libcurl Version: [LIBCURL_VERSION]
J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION]
[LIBCEF_VERSION]
--
GitLab