Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to send the specified version to the release note page...

Browse Source
This commit is contained in:
phr0z3nt04st
2010-05-28 11:00:32 -05:00
parent 8e612ae59f
commit f799e2c048
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llfloaterabout.cpp
View File

@@ -118,10 +118,10 @@ LLFloaterAbout::LLFloaterAbout()
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n", + llformat(" %d.%d.%d (%d) %s %s (%s)\n",
gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"), gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"),
__DATE__, __TIME__, __DATE__, __TIME__,
// <edit> // <edit>
// gSavedSettings.getString("VersionChannelName").c_str()); // gSavedSettings.getString("VersionChannelName").c_str());
gSavedSettings.getString("SpecifiedChannel").c_str()); gSavedSettings.getString("SpecifiedChannel").c_str());
// </edit> // </edit>
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style); 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() static std::string get_viewer_release_notes_url()
{ {
std::ostringstream version; std::ostringstream version;
version << LL_VERSION_MAJOR << "." // <edit>
<< LL_VERSION_MINOR << "." version << gSavedSettings.getU32("SpecifiedVersionMaj") << "." //LL_VERSION_MAJOR
<< LL_VERSION_PATCH << "." << gSavedSettings.getU32("SpecifiedVersionMin") << "." //LL_VERSION_MINOR
<< LL_VERSION_BUILD; << gSavedSettings.getU32("SpecifiedVersionPatch") << "." //LL_VERSION_PATCH
<< gSavedSettings.getU32("SpecifiedVersionBuild"); //LL_VERSION_BUILD
// </edit>
LLSD query; LLSD query;
// <edit> // <edit>
//query["channel"] = gSavedSettings.getString("VersionChannelName"); //query["channel"] = gSavedSettings.getString("VersionChannelName");
query["channel"] = gSavedSettings.getString("SpecifiedChannel"); query["channel"] = gSavedSettings.getString("SpecifiedChannel");
// I think the version below is only numbers.. // I think the version below is only numbers..
// </edit> // </edit>
query["version"] = version.str(); query["version"] = version.str();
std::ostringstream url; std::ostringstream url;