From 061abd8263b1fa91c344b8de7e254221cf3b4d58 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 1 Oct 2008 20:21:57 -0500
Subject: Added Imprudence-specific version numbers.

---
 linden/indra/llcommon/llversionviewer.h |  4 ++++
 linden/indra/newview/llappviewer.cpp    | 16 ++++++++++++----
 linden/indra/newview/llfloaterabout.cpp | 13 ++++++++-----
 linden/indra/newview/llpanellogin.cpp   | 17 +++++++++++++----
 4 files changed, 37 insertions(+), 13 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 2c6f951..385a3e9 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -42,4 +42,8 @@ const char * const LL_CHANNEL = "Imprudence";
 const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
+const S32 IMP_VERSION_MAJOR = 1;
+const S32 IMP_VERSION_MINOR = 0;
+const S32 IMP_VERSION_PATCH = 0;
+
 #endif
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;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index a90edb4..0486f57 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -109,11 +109,14 @@ LLFloaterAbout::LLFloaterAbout()
 	viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
 	// Version string
-	std::string version = LLAppViewer::instance()->getSecondLifeTitle()
-		+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
-				   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
-				   __DATE__, __TIME__,
-				   gSavedSettings.getString("VersionChannelName").c_str());
+	std::string version = llformat(
+	  "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+		IMP_VIEWER_NAME,
+	  IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH,
+		LL_VIEWER_NAME,
+	  LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
+	  __DATE__, __TIME__);
+
 	support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
 	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index ffee058..61bf215 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -419,15 +419,24 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	// childSetAction("quit_btn", onClickQuit, this);
 
-	std::string channel = gSavedSettings.getString("VersionChannelName");
-	std::string version = llformat("%d.%d.%d (%d)",
+	std::string imp_channel = gSavedSettings.getString("VersionChannelName");
+	std::string imp_version = llformat("%d.%d.%d",
+		IMP_VERSION_MAJOR,
+		IMP_VERSION_MINOR,
+		IMP_VERSION_PATCH );
+
+	std::string ll_channel = LL_VIEWER_NAME;
+	std::string ll_version = llformat("%d.%d.%d (%d)",
 		LL_VERSION_MAJOR,
 		LL_VERSION_MINOR,
 		LL_VERSION_PATCH,
 		LL_VIEWER_BUILD );
+
 	LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-	channel_text->setTextArg("[CHANNEL]", channel);
-	channel_text->setTextArg("[VERSION]", version);
+	channel_text->setTextArg("[CHANNEL]", imp_channel);
+	channel_text->setTextArg("[VERSION]", imp_version);
+	channel_text->setTextArg("[ALT_CHANNEL]", ll_channel);
+	channel_text->setTextArg("[ALT_VERSION]", ll_version);
 	channel_text->setClickedCallback(onClickVersion);
 	channel_text->setCallbackUserData(this);
 	
-- 
cgit v1.1