diff options
author | McCabe Maxsted | 2008-12-08 05:45:58 -0700 |
---|---|---|
committer | Jacek Antonelli | 2008-12-10 21:11:28 -0600 |
commit | a86e98f9a85aad5be2962323386352900b0f0c69 (patch) | |
tree | 8022776e676e8b56295ba61d4ef20dfe9664df2d /linden/indra/newview/llfloaterabout.cpp | |
parent | Changed Release Notes link to point to Imprudence (diff) | |
download | meta-impy-a86e98f9a85aad5be2962323386352900b0f0c69.zip meta-impy-a86e98f9a85aad5be2962323386352900b0f0c69.tar.gz meta-impy-a86e98f9a85aad5be2962323386352900b0f0c69.tar.bz2 meta-impy-a86e98f9a85aad5be2962323386352900b0f0c69.tar.xz |
Added test version info to llversionviewer.h
Diffstat (limited to 'linden/indra/newview/llfloaterabout.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index cb4d405..59e3100 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout() | |||
110 | 110 | ||
111 | // Version string | 111 | // Version string |
112 | std::string version = llformat( | 112 | std::string version = llformat( |
113 | "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n", | 113 | "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n", |
114 | IMP_VIEWER_NAME, | 114 | IMP_VIEWER_NAME, |
115 | IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, | 115 | IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST, |
116 | LL_VIEWER_NAME, | 116 | LL_VIEWER_NAME, |
117 | LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, | 117 | LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, |
118 | __DATE__, __TIME__); | 118 | __DATE__, __TIME__); |
@@ -266,8 +266,13 @@ static std::string get_viewer_release_notes_url() | |||
266 | << IMP_VERSION_MINOR << "." | 266 | << IMP_VERSION_MINOR << "." |
267 | << IMP_VERSION_PATCH; | 267 | << IMP_VERSION_PATCH; |
268 | 268 | ||
269 | std::ostringstream test_version; | ||
270 | |||
271 | if(IMP_VERSION_TEST != "") | ||
272 | test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST; | ||
273 | |||
269 | std::ostringstream url; | 274 | std::ostringstream url; |
270 | url << RELEASE_NOTES_BASE_URL << version.str(); | 275 | url << RELEASE_NOTES_BASE_URL << version.str() << test_version.str(); |
271 | 276 | ||
272 | return url.str(); | 277 | return url.str(); |
273 | } | 278 | } |