diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
| commit | ca3cea390ca44e6e6c390b390e0ebdfafd2afa9e (patch) | |
| tree | 005b934f87b6c5adc0a6f84ef6f12c67d606ce37 /indra/newview/llstartup.cpp | |
| parent | 1d9fe077a64d36272b32ae0fb1888d2b25aa1d43 (diff) | |
| parent | 5451af6cca43f296e1b5654ab3e611928929c1c9 (diff) | |
merge changes for storm-1537 : releasable mesh branch
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; } |