Added Imprudence-specific version numbers.

1 files changed, 12 insertions, 4 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 90d0429..3ef3894 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,8 +602,12 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d.%d", 
+    gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 
         gSavedSettings.getString("VersionChannelName").c_str(), 
+        IMP_VERSION_MAJOR, 
+        IMP_VERSION_MINOR, 
+        IMP_VERSION_PATCH, 
+        LL_VIEWER_NAME,
         LL_VERSION_MAJOR, 
         LL_VERSION_MINOR, 
         LL_VERSION_PATCH, 
@@ -2216,6 +2220,9 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["SLLog"] = LLError::logFileName();
 
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
+        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
+        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2245,9 +2252,7 @@ void LLAppViewer::writeSystemInfo()
 #endif
 
         // Dump some debugging info
-        LL_INFOS("SystemInfo") << gSecondLife
-                        << " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
-                        << LL_ENDL;
+        LL_INFOS("SystemInfo") << gCurrentVersion << LL_ENDL;
 
         // Dump the local time and time zone
         time_t now;
@@ -2298,6 +2303,9 @@ void LLAppViewer::handleViewerCrash()
         //to check against no matter what
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
 
+        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
+        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
+        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;