diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
| commit | f975cfd7361729195f2bb14d874e5eacc6140759 (patch) | |
| tree | 471389ca5dab742aaf84c678c4dcef3433da8e9a /indra/newview/llstartup.cpp | |
| parent | 2f8f1c7a44f45490db5b5f040914e42aef2f5280 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 39d640e85f..73234552e5 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1396,8 +1396,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 { @@ -1901,6 +1909,7 @@ bool idle_startup() LLNotificationsUtil::add("InventoryUnusable"); } + LLInventoryModelBackgroundFetch::instance().start(); gInventory.createCommonSystemCategories(); // It's debatable whether this flag is a good idea - sets all |