diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
| commit | f61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch) | |
| tree | e644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/newview/llstartup.cpp | |
| parent | bc06a9acf91035903d497bdd66e9bb26859616be (diff) | |
| parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) | |
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d01f75beb4..d5a3b7b5ea 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1615,7 +1615,14 @@ bool idle_startup() if (!gAgentMovementCompleted && timeout.getElapsedTimeF32() > STATE_AGENT_WAIT_TIMEOUT) { LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL; - LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status); + if (gRememberPassword) + { + LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status); + } + else + { + LLNotificationsUtil::add("LoginPacketNeverReceivedNoTP", LLSD(), LLSD(), login_alert_status); + } reset_login(); } return FALSE; @@ -2350,7 +2357,14 @@ void use_circuit_callback(void**, S32 result) { // Make sure user knows something bad happened. JC LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL; - LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status); + if (gRememberPassword) + { + LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status); + } + else + { + LLNotificationsUtil::add("LoginPacketNeverReceivedNoTP", LLSD(), LLSD(), login_alert_status); + } reset_login(); } else |