aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.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/llappviewer.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 'linden/indra/newview/llappviewer.cpp')
-rw-r--r--linden/indra/newview/llappviewer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,11 +602,12 @@ bool LLAppViewer::init()
602 writeSystemInfo(); 602 writeSystemInfo();
603 603
604 // Build a string representing the current version number. 604 // Build a string representing the current version number.
605 gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 605 gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d",
606 gSavedSettings.getString("VersionChannelName").c_str(), 606 gSavedSettings.getString("VersionChannelName").c_str(),
607 IMP_VERSION_MAJOR, 607 IMP_VERSION_MAJOR,
608 IMP_VERSION_MINOR, 608 IMP_VERSION_MINOR,
609 IMP_VERSION_PATCH, 609 IMP_VERSION_PATCH,
610 IMP_VERSION_TEST,
610 LL_VIEWER_NAME, 611 LL_VIEWER_NAME,
611 LL_VERSION_MAJOR, 612 LL_VERSION_MAJOR,
612 LL_VERSION_MINOR, 613 LL_VERSION_MINOR,
@@ -2247,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
2247 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2248 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2248 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2249 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2249 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2250 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2251 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2250 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2252 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2251 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2253 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2252 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2254 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2330,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
2330 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2332 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2331 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2333 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2332 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2334 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2335 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2333 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2336 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2334 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2337 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2335 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2338 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;