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

Auto-version system

Browse Source
This commit is contained in:
Siana Gearz
2012-02-09 13:34:39 +01:00
parent 2ef5673c18
commit acf378e9f2
22 changed files with 172 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloaterabout.cpp
View File

@@ -49,7 +49,7 @@
#include "llagent.h"
#include "llviewerstats.h"
#include "llviewerregion.h"
#include "llversionviewer.h"
#include "sgversion.h"
#include "llviewerbuild.h"
#include "lluictrlfactory.h"
#include "lluri.h"
@@ -137,9 +137,9 @@ LLFloaterAbout::LLFloaterAbout()
// Version string
std::string version = std::string(LLAppViewer::instance()->getSecondLifeTitle()
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
gVersionMajor, gVersionMinor, gVersionPatch, LL_VIEWER_BUILD,
__DATE__, __TIME__,
LL_CHANNEL));
gVersionChannel));
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
@@ -331,13 +331,13 @@ static std::string get_viewer_release_notes_url()
{
return "http://www.singularityviewer.org";
/*std::ostringstream version;
version << LL_VERSION_MAJOR
<< "." << LL_VERSION_MINOR
<< "." << LL_VERSION_PATCH
<< "." << LL_VERSION_BUILD;
version << gVersionMajor
<< "." << gVersionMinor
<< "." << gVersionPatch
<< "." << gVersionBuild;
LLSD query;
query["channel"] = LL_CHANNEL;
query["channel"] = gVersionChannel;
query["version"] = version.str();