diff options
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llappviewer.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4fb6607723..ae85d1450e 100755..100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3309,9 +3309,12 @@ LLSD LLAppViewer::getViewerInfo() const version.append(LLVersionInfo::getBuild()); info["VIEWER_VERSION"] = version; info["VIEWER_VERSION_STR"] = LLVersionInfo::getVersion(); - info["BUILD_DATE"] = __DATE__; - info["BUILD_TIME"] = __TIME__; info["CHANNEL"] = LLVersionInfo::getChannel(); + std::string build_config = LLVersionInfo::getBuildConfig(); + if (build_config != "Release") + { + info["BUILD_CONFIG"] = build_config; + } // return a URL to the release notes for this viewer, such as: // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456 @@ -3323,14 +3326,6 @@ LLSD LLAppViewer::getViewerInfo() const info["VIEWER_RELEASE_NOTES_URL"] = url; -#if LL_MSVC - info["COMPILER"] = "MSVC"; - info["COMPILER_VERSION"] = _MSC_VER; -#elif LL_GNUC - info["COMPILER"] = "GCC"; - info["COMPILER_VERSION"] = GCC_VERSION; -#endif - // Position LLViewerRegion* region = gAgent.getRegion(); if (region) @@ -3364,7 +3359,7 @@ LLSD LLAppViewer::getViewerInfo() const #endif info["OPENGL_VERSION"] = (const char*)(glGetString(GL_VERSION)); - info["LIBCURL_VERSION"] = LLCurl::getVersionString(); + info["J2C_VERSION"] = LLImageJ2C::getEngineInfo(); bool want_fullname = true; info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : LLSD(); @@ -3457,6 +3452,10 @@ std::string LLAppViewer::getViewerInfoString() const // Now build the various pieces support << LLTrans::getString("AboutHeader", args); + if (info.has("BUILD_CONFIG")) + { + support << "\n" << LLTrans::getString("BuildConfig", args); + } if (info.has("REGION")) { support << "\n\n" << LLTrans::getString("AboutPosition", args); |