From 05068186c349294caf4fef3c970f9d75a9f30460 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 4 Oct 2018 16:35:38 -0400 Subject: DRTVWR-474: Make login coroutine sync with updater process on failure. Specifically, introduce an LLEventMailDrop("LoginSync"). When the updater detects that an update is required, it will post to that rendezvous point. When login.cgi responds with login failure, make the login coroutine wait (a few seconds) for that ping from the updater. If we receive that ping and if it contains a "reply" key, make the fail.login listener respond to the updater with an indication of whether to proceed with update. If both login.cgi and the updater concur that an update is required, produce a new confirmation message for the user and then (once user responds) tell the updater to proceed. Otherwise, produce the usual login-failure message and tell the updater never mind. Introduce LLCoro::OverrideConsuming to provide temporary save/restore of the set_consuming() / get_consuming() flag. It's a good idea to set the consuming flag when retrieving data from an LLEventMailDrop. --- indra/newview/skins/default/xui/en/notifications.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9eaa5330c3..5f9b8adc89 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3841,7 +3841,6 @@ Finished download of raw terrain file to: name="RequiredUpdate" type="alertmodal"> Version [VERSION] is required for login. -This should have been updated for you but apparently was not. Please download from https://secondlife.com/support/downloads/ confirm + +Version [VERSION] is required for login. +Click OK to download and install. + confirm + + + Date: Fri, 5 Oct 2018 14:38:25 -0400 Subject: DRTVWR-474: Add OptionaUpdateReady, PromptOptionalUpdate notifications. --- .../newview/skins/default/xui/en/notifications.xml | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5f9b8adc89..e2859603e0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3860,6 +3860,32 @@ Click OK to download and install. yestext="OK"/> + +Version [VERSION] has been downloaded and is ready to install. +Click OK to install. + confirm + + + + +Version [VERSION] has been downloaded and is ready to install. +Proceed? + confirm + + +