From da7941be28dec850ad0757a8ff2fbfdf1b1b369b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 5 Dec 2008 06:20:22 -0700
Subject: Changed Release Notes link to point to Imprudence

---
 linden/indra/newview/llfloaterabout.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'linden/indra/newview/llfloaterabout.cpp')

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4704c5b..cb4d405 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -262,17 +262,12 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
 	std::ostringstream version;
-	version << LL_VERSION_MAJOR << "."
-		<< LL_VERSION_MINOR << "."
-		<< LL_VERSION_PATCH << "."
-		<< LL_VERSION_BUILD;
-
-	LLSD query;
-	query["channel"] = gSavedSettings.getString("VersionChannelName");
-	query["version"] = version.str();
+	version << IMP_VERSION_MAJOR << "."
+		<< IMP_VERSION_MINOR << "."
+		<< IMP_VERSION_PATCH;
 
 	std::ostringstream url;
-	url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+	url << RELEASE_NOTES_BASE_URL << version.str();
 
 	return url.str();
 }
-- 
cgit v1.1


From a86e98f9a85aad5be2962323386352900b0f0c69 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 8 Dec 2008 05:45:58 -0700
Subject: Added test version info to llversionviewer.h

---
 linden/indra/newview/llfloaterabout.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llfloaterabout.cpp')

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index cb4d405..59e3100 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
 
 	// Version string
 	std::string version = llformat(
-	  "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+	  "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
 		IMP_VIEWER_NAME,
-	  IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH,
+	  IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
 		LL_VIEWER_NAME,
 	  LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
 	  __DATE__, __TIME__);
@@ -266,8 +266,13 @@ static std::string get_viewer_release_notes_url()
 		<< IMP_VERSION_MINOR << "."
 		<< IMP_VERSION_PATCH;
 
+	std::ostringstream test_version;
+
+	if(IMP_VERSION_TEST != "")
+		test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST;
+
 	std::ostringstream url;
-	url << RELEASE_NOTES_BASE_URL << version.str();
+	url << RELEASE_NOTES_BASE_URL << version.str() << test_version.str();
 
 	return url.str();
 }
-- 
cgit v1.1


From a7a5691d03624f7c70b99203d9d6ee00d2ffaf91 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 11 Dec 2008 14:28:45 -0600
Subject: Fixed bad string comparison (rel notes url) [#28]

Reported by Balp Allen.
---
 linden/indra/newview/llfloaterabout.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llfloaterabout.cpp')

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 59e3100..f6e7792 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -268,7 +268,7 @@ static std::string get_viewer_release_notes_url()
 
 	std::ostringstream test_version;
 
-	if(IMP_VERSION_TEST != "")
+	if( strcmp(IMP_VERSION_TEST, "") != 0 )
 		test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST;
 
 	std::ostringstream url;
-- 
cgit v1.1


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.
---
 linden/indra/newview/llfloaterabout.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'linden/indra/newview/llfloaterabout.cpp')

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