From 760f23b370b22e0a070ccb767168db07e936f737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Mon, 6 Jan 2020 01:54:30 -0500
Subject: [PATCH] Sync with upstream to make the simulator version change
 notification useful

---
 indra/newview/llviewermessage.cpp                       | 7 ++++---
 indra/newview/skins/default/xui/de/notifications.xml    | 5 ++++-
 indra/newview/skins/default/xui/en-us/notifications.xml | 4 +++-
 indra/newview/skins/default/xui/es/notifications.xml    | 5 +++--
 indra/newview/skins/default/xui/fr/notifications.xml    | 2 ++
 indra/newview/skins/default/xui/pt/notifications.xml    | 2 ++
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index bf1c95af7..03e8b915e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4882,9 +4882,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 	if (!gLastVersionChannel.empty() && gSavedSettings.getBOOL("SGServerVersionChangedNotification"))
 	{
-		LLSD payload;
-		payload["message"] = version_channel;
-		LLNotificationsUtil::add("ServerVersionChanged", LLSD(), payload);
+		LLSD args;
+		args["OLD_VERSION"] = gLastVersionChannel;
+		args["NEW_VERSION"] = version_channel;
+		LLNotificationsUtil::add("ServerVersionChanged", args);
 	}
 
 	gLastVersionChannel = version_channel;
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index c876d0ea9..8de81768d 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2406,7 +2406,10 @@ Klicken Sie auf &#x201E;Akzeptieren&#x201C;, um dem Chat beizutreten, oder auf &
   <notification name="ThrottledSLURL">Mehrere SLurls wurden von einem nicht vertrauten Browser innerhalb einer kurzen Zeitspanne empfangen.
 Sie wurden aus Sicherheitsgr&#xFC;nden geblockt f&#xFC;r ein paar Minuten.<tag>Sicherheit</tag></notification>
 
-  <notification name="ServerVersionChanged">Die Region, die Sie betreten haben, verwendet eine andere Simulatorversion. Klicken Sie auf diese Nachricht, um weitere Informationen zu erhalten.</notification>
+  <notification name="ServerVersionChanged">Die Region, die Sie betreten haben, verwendet eine andere Simulatorversion.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
+  </notification>
      <notification name="ObjectMediaFailure">Server Fehler: Media update oder download fehlgeschlagen.
 '[ERROR]'<tag>fehlgeschlagen</tag><usetemplate name="okbutton" yestext="OK"/></notification>
 
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 9f7c33810..99dab549c 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -11415,7 +11415,9 @@ The object you're attempting to restore in world is no copy, if you do not have
    name="ServerVersionChanged"
    priority="high"
    type="notifytip">
-The region you have entered is running a different simulator version. Click this message for details.
+The region you have entered is running a different simulator version.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 810a3608d..2a9f67f73 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -6069,7 +6069,8 @@ Ingresa el dominio a añadir en la [LIST]:
 
 	<notification name="ServerVersionChanged">
 		La región en la que has entrado está utilizando una versión diferente del simulador.
-Pulsa en este mensaje para ver más detalles.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 	
 	<notification name="SGIncompleteAppearance">
@@ -6135,4 +6136,4 @@ Por favor, asegurate de que tu reporte no será un duplicado de uno ya existente
     <usetemplate ignoretext="Cuando se abra el navegador para ir al Issue Tracker de [SHORT_APP_NAME]" name="okcancelignore" notext="Cancelar" yestext="Ir a la Página"/>
 	</notification>	
 	
-</notifications>
\ No newline at end of file
+</notifications>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 34b5f24dc..a8eb049e3 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -3697,6 +3697,8 @@ Une erreur est survenue pendant la connexion au chat vocal pour [VOICE_CHANNEL_N
 
 	<notification name="ServerVersionChanged">
 La région dans laquelle vous avez pénétré utilise une version de simulateur différente. C'est ballot, mais c'est la vie !
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 
 	<notification name="UnableToOpenCommandURL">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index f3c84b67d..9a4acf92a 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -3962,6 +3962,8 @@ Mais detalhes no log.
 
 	<notification name="ServerVersionChanged">
 		A região em que você entrou está rodando uma versão diferente de simulador.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 	<notification name="MeshUploadPermError">
 		Erro ao solicitar permissões de upload de mesh.