diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-14 18:43:49 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-14 18:43:49 -0700 |
| commit | fde88ae24d1093fd0f24fe9cfd66dc05a0d1c51f (patch) | |
| tree | bc15f23edb2208455ed9c3888e9447380c0ffc04 /indra/newview/llstartup.cpp | |
| parent | 4e61870f3af1ab87d0d0e1e9c2024636b8fe68d3 (diff) | |
Potential fix for SH-1854 and SH-1125 (caps issues)
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4dfcb85295..46ff3d808a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1242,6 +1242,25 @@ bool idle_startup() //--------------------------------------------------------------------- if(STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) { + LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(gFirstSimHandle); + if (regionp->capabilitiesReceived()) + { + LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED ); + } + else + { + U32 num_retries = regionp->getNumSeedCapRetries(); + if (num_retries > 0) + { + LLStringUtil::format_map_t args; + args["[NUMBER]"] = llformat("%d", num_retries + 1); + set_startup_status(0.4f, LLTrans::getString("LoginRetrySeedCapGrant", args), gAgent.mMOTD); + } + else + { + set_startup_status(0.4f, LLTrans::getString("LoginRequestSeedCapGrant"), gAgent.mMOTD); + } + } return FALSE; } |