From b4a5bf0e8cf00d3a928d28fae851148aa23c7150 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 1 Mar 2022 13:40:03 +0200 Subject: merge conflict fix --- indra/newview/llviewerregion.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 5050ac1257..2b65b5f3ac 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -283,13 +283,6 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle) // record that we just entered a new region newRegionEntry(*regionp); - // After a few attempts, continue login. But keep trying to get the caps: - if (impl->mSeedCapAttempts >= impl->mSeedCapMaxAttemptsBeforeLogin && - STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) - { - LLStartUp::setStartupState(STATE_SEED_CAP_GRANTED); - } - if (impl->mSeedCapAttempts > impl->mSeedCapMaxAttempts) { // *TODO: Give a user pop-up about this error? -- cgit v1.2.3