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

Moving MotD and SL Grid Status chat printing from STATE_WORLD_INIT to STATE_STARTED

Northspring 2014-07-09 23:23:06 +02:00
parent ac943e7a31
commit ed4331f669
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llstartup.cpp
View File

@ -1647,18 +1647,6 @@ bool idle_startup()
if (STATE_WORLD_INIT == LLStartUp::getStartupState())
{
set_startup_status(0.30f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
// <FS:Techwolf Lupindo> FIRE-6643 Display MOTD when login screens are disabled
if(gSavedSettings.getBOOL("FSDisableLoginScreens"))
{
reportToNearbyChat(gAgent.mMOTD);
}
// </FS:Techwolf Lupindo>
// <FS:PP>
if (gSavedSettings.getBOOL("AutoQueryGridStatus"))
{
LLHTTPClient::get(gSavedSettings.getString("AutoQueryGridStatusURL"), new SLGridStatusResponder());
}
// </FS:PP>
display_startup();
// We should have an agent id by this point.
llassert(!(gAgentID == LLUUID::null));
@ -2783,6 +2771,19 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
llassert(LLPathfindingManager::getInstance() != NULL);
LLPathfindingManager::getInstance()->initSystem();
// <FS:Techwolf Lupindo> FIRE-6643 Display MOTD when login screens are disabled
if (gSavedSettings.getBOOL("FSDisableLoginScreens"))
{
reportToNearbyChat(gAgent.mMOTD);
}
// </FS:Techwolf Lupindo>
// <FS:PP>
if (gSavedSettings.getBOOL("AutoQueryGridStatus"))
{
LLHTTPClient::get(gSavedSettings.getString("AutoQueryGridStatusURL"), new SLGridStatusResponder());
}
// </FS:PP>
return TRUE;
}