From fcbbd2b6ca4b7836d3e1554dc493fe0af2139d65 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 27 Sep 2018 14:12:12 +0200
Subject: [PATCH] Set version in VIEWER_GENERATION default substitute
 automatically based on major version number

---
 indra/newview/llappviewer.cpp                  | 6 ++++++
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2b6c70f63b..196b6dc74a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3455,6 +3455,12 @@ void LLAppViewer::initStrings()
 		// translation strings into this one.
 		LLTrans::setDefaultArg(brackets, LLTrans::getString(nobrackets));
 	}
+
+	// <FS:Ansariel> Set version number in VIEWER_GENERATION default substitute automatically
+	LLStringUtil:: format_map_t gen_args;
+	gen_args["[VERSION]"] = llformat("%d", LLVersionInfo::getMajor());
+	LLTrans::setDefaultArg("[VIEWER_GENERATION]", LLTrans::getString("VIEWER_GENERATION", gen_args));
+	// </FS:Ansariel>
 }
 
 //
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ad86917a10..74d91ed87b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -13,7 +13,7 @@
 	<string name="SUPPORT_SITE">Second Life Support Portal</string>
 	<string name="DOWNLOAD_URL">https://www.firestormviewer.org/downloads</string>
 	<string name="CURRENT_GRID"/> <!-- Will be set in fsgridhandler.cpp / llviewernetwork.cpp -->
-	<string name="VIEWER_GENERATION">Viewer 5</string>
+	<string name="VIEWER_GENERATION">Viewer [VERSION]</string>
 
 	<!-- starting up -->
 	<string name="StartupDetectingHardware">Detecting hardware...</string>