From f799e2c048df06577c4ceec40cb439ac0ce19297 Mon Sep 17 00:00:00 2001 From: phr0z3nt04st Date: Fri, 28 May 2010 11:00:32 -0500 Subject: [PATCH] Make sure to send the specified version to the release note page... --- indra/newview/llfloaterabout.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index e0b7a4763..2c7a51200 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -118,10 +118,10 @@ LLFloaterAbout::LLFloaterAbout() + llformat(" %d.%d.%d (%d) %s %s (%s)\n", gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"), __DATE__, __TIME__, - // - // gSavedSettings.getString("VersionChannelName").c_str()); - gSavedSettings.getString("SpecifiedChannel").c_str()); - // + // + // gSavedSettings.getString("VersionChannelName").c_str()); + gSavedSettings.getString("SpecifiedChannel").c_str()); + // support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style); @@ -286,17 +286,18 @@ 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; - + // + version << gSavedSettings.getU32("SpecifiedVersionMaj") << "." //LL_VERSION_MAJOR + << gSavedSettings.getU32("SpecifiedVersionMin") << "." //LL_VERSION_MINOR + << gSavedSettings.getU32("SpecifiedVersionPatch") << "." //LL_VERSION_PATCH + << gSavedSettings.getU32("SpecifiedVersionBuild"); //LL_VERSION_BUILD + // LLSD query; - // - //query["channel"] = gSavedSettings.getString("VersionChannelName"); - query["channel"] = gSavedSettings.getString("SpecifiedChannel"); - // I think the version below is only numbers.. - // + // + //query["channel"] = gSavedSettings.getString("VersionChannelName"); + query["channel"] = gSavedSettings.getString("SpecifiedChannel"); + // I think the version below is only numbers.. + // query["version"] = version.str(); std::ostringstream url;