Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with upstream to make the simulator version change notification useful

Browse Source
This commit is contained in:
Liru Færs
2020-01-06 01:54:30 -05:00
parent a7cba5f1a3
commit 760f23b370
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewermessage.cpp
View File

@@ -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;

5
indra/newview/skins/default/xui/de/notifications.xml
View File

@@ -2406,7 +2406,10 @@ Klicken Sie auf „Akzeptieren“, 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>

4
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -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

5
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -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>
</notifications>

2
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -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">

2
indra/newview/skins/default/xui/pt/notifications.xml
View File

@@ -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.