aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanellogin.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-12-08 05:45:58 -0700
committerJacek Antonelli2008-12-10 21:11:28 -0600
commita86e98f9a85aad5be2962323386352900b0f0c69 (patch)
tree8022776e676e8b56295ba61d4ef20dfe9664df2d /linden/indra/newview/llpanellogin.cpp
parentChanged Release Notes link to point to Imprudence (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/newview/llpanellogin.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 09e2cee..40a3a7f 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -360,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
360 // childSetAction("quit_btn", onClickQuit, this); 360 // childSetAction("quit_btn", onClickQuit, this);
361 361
362 std::string imp_channel = gSavedSettings.getString("VersionChannelName"); 362 std::string imp_channel = gSavedSettings.getString("VersionChannelName");
363 std::string imp_version = llformat("%d.%d.%d", 363 std::string imp_version = llformat("%d.%d.%d %s",
364 IMP_VERSION_MAJOR, 364 IMP_VERSION_MAJOR,
365 IMP_VERSION_MINOR, 365 IMP_VERSION_MINOR,
366 IMP_VERSION_PATCH ); 366 IMP_VERSION_PATCH,
367 IMP_VERSION_TEST );
367 368
368 std::string ll_channel = LL_VIEWER_NAME; 369 std::string ll_channel = LL_VIEWER_NAME;
369 std::string ll_version = llformat("%d.%d.%d (%d)", 370 std::string ll_version = llformat("%d.%d.%d (%d)",