aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-14 13:51:33 -0700
committerJacek Antonelli2010-06-19 02:40:53 -0500
commitb33c37c28d94e45e67c9176e420d6e386970f6dd (patch)
tree2909d4af013c7a49fb683331e9f2dc5b31dea0c7 /linden/indra/newview/llfloaterabout.cpp
parentupdate install.xml to fetch fixed glib-2.20.5 package for Linux64. (diff)
downloadmeta-impy-b33c37c28d94e45e67c9176e420d6e386970f6dd.zip
meta-impy-b33c37c28d94e45e67c9176e420d6e386970f6dd.tar.gz
meta-impy-b33c37c28d94e45e67c9176e420d6e386970f6dd.tar.bz2
meta-impy-b33c37c28d94e45e67c9176e420d6e386970f6dd.tar.xz
Set the imprudence viewer version in xml
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterabout.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 772428e..7e6c43f 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -50,8 +50,6 @@
50#include "llagent.h" 50#include "llagent.h"
51#include "llviewerstats.h" 51#include "llviewerstats.h"
52#include "llviewerregion.h" 52#include "llviewerregion.h"
53#include "llversionviewer.h"
54#include "llviewerbuild.h"
55#include "lluictrlfactory.h" 53#include "lluictrlfactory.h"
56#include "lluri.h" 54#include "lluri.h"
57#include "llweb.h" 55#include "llweb.h"
@@ -61,6 +59,7 @@
61#include "llglheaders.h" 59#include "llglheaders.h"
62#include "llmediamanager.h" 60#include "llmediamanager.h"
63#include "llwindow.h" 61#include "llwindow.h"
62#include "viewerversion.h"
64 63
65#if LL_WINDOWS 64#if LL_WINDOWS
66#include "lldxhardware.h" 65#include "lldxhardware.h"
@@ -118,10 +117,10 @@ LLFloaterAbout::LLFloaterAbout()
118 // Version string 117 // Version string
119 std::string version = llformat( 118 std::string version = llformat(
120 "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n", 119 "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
121 IMP_VIEWER_NAME, 120 ViewerVersion::getImpViewerName().c_str(),
122 IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST, 121 ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), ViewerVersion::getImpTestVersion().c_str(),
123 LL_VIEWER_NAME, 122 ViewerVersion::getLLViewerName().c_str(),
124 LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, 123 ViewerVersion::getLLMajorVersion(), ViewerVersion::getLLMinorVersion(), ViewerVersion::getLLPatchVersion(), ViewerVersion::getLLBuildVersion(),
125 __DATE__, __TIME__); 124 __DATE__, __TIME__);
126 125
127 support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); 126 support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
@@ -315,13 +314,13 @@ void LLFloaterAbout::show(void*)
315static std::string get_viewer_release_notes_url() 314static std::string get_viewer_release_notes_url()
316{ 315{
317 std::ostringstream version; 316 std::ostringstream version;
318 version << IMP_VERSION_MAJOR << "." 317 version << ViewerVersion::getImpMajorVersion() << "."
319 << IMP_VERSION_MINOR << "." 318 << ViewerVersion::getImpMinorVersion() << "."
320 << IMP_VERSION_PATCH; 319 << ViewerVersion::getImpPatchVersion();
321 320
322 // Append the test version if it's not empty 321 // Append the test version if it's not empty
323 if( strcmp(IMP_VERSION_TEST, "") != 0 ) 322 if( !(ViewerVersion::getImpTestVersion().empty()) )
324 version << "-" << IMP_VERSION_TEST; 323 version << "-" << ViewerVersion::getImpTestVersion();
325 324
326 std::ostringstream url; 325 std::ostringstream url;
327 url << RELEASE_NOTES_BASE_URL << version.str(); 326 url << RELEASE_NOTES_BASE_URL << version.str();