diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-03-20 23:44:54 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-03-21 00:13:56 +0200 |
| commit | e5b965c892154e5933b9cfe80ce750ff6f542620 (patch) | |
| tree | f0e5023acded3d3630bfcab45e247f5202d4ca67 /indra | |
| parent | cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99 (diff) | |
SL-19435 Bounce user back to login if caps are not present
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llstartup.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6883ead5ee..dd3b33982a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1392,8 +1392,16 @@ bool idle_startup() } else if (regionp->capabilitiesError()) { - // Try to connect despite capabilities' error state - LLStartUp::setStartupState(STATE_SEED_CAP_GRANTED); + LL_WARNS("AppInit") << "Failed to get capabilities. Backing up to login screen!" << LL_ENDL; + if (gRememberPassword) + { + LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status); + } + else + { + LLNotificationsUtil::add("LoginPacketNeverReceivedNoTP", LLSD(), LLSD(), login_alert_status); + } + reset_login(); } else { |