Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts:

	linden/indra/newview/llfloaterabout.cpp

2 files changed, 19 insertions, 9 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b992e08..c5f3d5d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2008-12-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * 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.
+
+
 2008-12-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llpanellogin.cpp:
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 7a0dd84..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -263,18 +263,15 @@ static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
         version << IMP_VERSION_MAJOR << "."
-                << IMP_VERSION_MINOR << "."
-                << IMP_VERSION_PATCH;
+                << IMP_VERSION_MINOR << "."
+                << IMP_VERSION_PATCH;
 
-        std::ostringstream test_version;
-
-        if(strcmp(IMP_VERSION_TEST,"")) {
-                test_version << "#" << "Imprudence_" << version.str() << "_"
-                    << IMP_VERSION_TEST;
-        }
+        // Append the test version if it's not empty
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
+                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();
 }