livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict fix

meow-7.2.2
Mnikolenko Productengine 2022-03-01 13:40:03 +02:00
parent 1e0eafd50c
commit b4a5bf0e8c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewerregion.cpp
View File

@ -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?