From e99716b74d442e2aeb88e2dbd480f2e99a6797b3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 11 Dec 2008 14:32:04 -0600 Subject: Simplified release notes URL scheme. Now uses e.g. "wiki/Release Notes/1.0.0-RC2", which is set up as a wiki redirect. --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llfloaterabout.cpp | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ea8f4c5..c5f3d5d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,12 @@ 2008-12-11 Jacek Antonelli * linden/indra/newview/llfloaterabout.cpp: + Simplified release notes URL scheme. + Now uses e.g. "wiki/Release Notes/1.0.0-RC2", + which is set up as a wiki redirect. + + + * linden/indra/newview/llfloaterabout.cpp: Fixed bad string comparison (rel notes url) [#28] Reported by Balp Allen. diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index f6e7792..af436c5 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp @@ -263,16 +263,15 @@ static std::string get_viewer_release_notes_url() { std::ostringstream version; version << IMP_VERSION_MAJOR << "." - << IMP_VERSION_MINOR << "." - << IMP_VERSION_PATCH; - - std::ostringstream test_version; + << IMP_VERSION_MINOR << "." + << IMP_VERSION_PATCH; + // Append the test version if it's not empty if( strcmp(IMP_VERSION_TEST, "") != 0 ) - test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST; + version << "-" << IMP_VERSION_TEST; std::ostringstream url; - url << RELEASE_NOTES_BASE_URL << version.str() << test_version.str(); + url << RELEASE_NOTES_BASE_URL << version.str(); return url.str(); } -- cgit v1.1