Skip to content
Snippets Groups Projects
Commit c637d4de authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Add more info to about floater

parent 331c0809
No related branches found
No related tags found
No related merge requests found
...@@ -3136,6 +3136,20 @@ LLSD LLAppViewer::getViewerInfo() const ...@@ -3136,6 +3136,20 @@ LLSD LLAppViewer::getViewerInfo() const
} }
info["VIEWER_RELEASE_NOTES_URL"] = url; 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 // Position
LLViewerRegion* region = gAgent.getRegion(); LLViewerRegion* region = gAgent.getRegion();
if (region) if (region)
...@@ -3214,7 +3228,7 @@ LLSD LLAppViewer::getViewerInfo() const ...@@ -3214,7 +3228,7 @@ LLSD LLAppViewer::getViewerInfo() const
#endif #endif
// Libraries // Libraries
info["LIBCURL_VERSION"] = LLCore::LLHttp::getCURLVersion();
info["J2C_VERSION"] = LLImageJ2C::getEngineInfo(); info["J2C_VERSION"] = LLImageJ2C::getEngineInfo();
bool want_fullname = true; bool want_fullname = true;
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined"; info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined";
...@@ -3230,7 +3244,7 @@ LLSD LLAppViewer::getViewerInfo() const ...@@ -3230,7 +3244,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
} }
#if !LL_LINUX #if defined(CEF_VERSION)
std::ostringstream cef_ver_codec; std::ostringstream cef_ver_codec;
cef_ver_codec << "Dullahan: "; cef_ver_codec << "Dullahan: ";
cef_ver_codec << DULLAHAN_VERSION_MAJOR; cef_ver_codec << DULLAHAN_VERSION_MAJOR;
......
...@@ -24,7 +24,10 @@ ...@@ -24,7 +24,10 @@
[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) [CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit)
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string> </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="BuildConfig">Build Configuration [BUILD_CONFIG]</string>
<string name="BuildDate">Build Date: [BUILD_DATE] [BUILD_TIME]</string>
<string name="AboutPosition"> <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 &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
...@@ -68,6 +71,7 @@ HiDPI display mode: [HIDPI] ...@@ -68,6 +71,7 @@ HiDPI display mode: [HIDPI]
</string> </string>
<string name="AboutLibs"> <string name="AboutLibs">
RestrainedLove API: [RLV_VERSION] RestrainedLove API: [RLV_VERSION]
libcurl Version: [LIBCURL_VERSION]
J2C Decoder Version: [J2C_VERSION] J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION]
[LIBCEF_VERSION] [LIBCEF_VERSION]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment