aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAnders Arnholm2008-12-13 18:49:24 +0100
committerAnders Arnholm2008-12-13 18:49:24 +0100
commitc7fca44072ae101b986a87c87ebda1e99de5141a (patch)
treea9884591ca07983234a0ed41275d7b92dc513f46 /linden/indra/newview/llappviewer.cpp
parentMerge 1.0.0 RC2 into openal (diff)
parentMerge branch 'next' of git://github.com/jacek/imprudence into next (diff)
downloadmeta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.zip
meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.gz
meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.bz2
meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.xz
Merge branch 'next' into openal
Conflicts: ChangeLog.txt
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 4fe387f..2cf418e 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,
@@ -2248,6 +2249,7 @@ void LLAppViewer::writeSystemInfo()
2248 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2249 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2249 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2250 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2250 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2251 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2252 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2251 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2253 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2252 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2254 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2253 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2255 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2331,6 +2333,7 @@ void LLAppViewer::handleViewerCrash()
2331 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2333 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2332 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2334 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2333 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2335 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2336 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2334 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2337 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2335 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2338 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2336 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2339 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;