From e3660b2fdf88f70a0c0f573523e7ef1c372e2c37 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 19 May 2011 00:19:12 -0500 Subject: Ported viewerinfo.cpp from Kokua. It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it. --- linden/indra/newview/llfloaterabout.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'linden/indra/newview/llfloaterabout.cpp') diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index a5d2c98..8878de5 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp @@ -59,7 +59,7 @@ #include "llglheaders.h" #include "llviewerwindow.h" #include "llwindow.h" -#include "viewerversion.h" +#include "viewerinfo.h" // [RLVa:KB] #include "rlvhandler.h" @@ -120,11 +120,7 @@ LLFloaterAbout::LLFloaterAbout() viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); // Version string - std::string version = llformat( - "%s %d.%d.%d %s (%s %s)\n", - ViewerVersion::getImpViewerName().c_str(), - ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), ViewerVersion::getImpTestVersion().c_str(), - __DATE__, __TIME__); + std::string version = llformat("%s (%s %s)\n", ViewerInfo::prettyInfo().c_str(), __DATE__, __TIME__); support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style); @@ -318,13 +314,13 @@ void LLFloaterAbout::onClickCopy(void* user_data) static std::string get_viewer_release_notes_url() { std::ostringstream version; - version << ViewerVersion::getImpMajorVersion() << "." - << ViewerVersion::getImpMinorVersion() << "." - << ViewerVersion::getImpPatchVersion(); + version << ViewerInfo::versionMajor() << "." + << ViewerInfo::versionMinor() << "." + << ViewerInfo::versionPatch(); // Append the test version if it's not empty - if( !(ViewerVersion::getImpTestVersion().empty()) ) - version << "-" << ViewerVersion::getImpTestVersion(); + if( !(ViewerInfo::versionExtra().empty()) ) + version << "-" << ViewerInfo::versionExtra(); std::ostringstream url; url << RELEASE_NOTES_BASE_URL << version.str(); -- cgit v1.1