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

FIRE-6643 Display MOTD when login screens are disabled.

master
Techwolf Lupindo 2013-06-23 22:22:27 -04:00
parent 409012e196
commit cf2bd13dfe
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llstartup.cpp
View File

@ -228,6 +228,7 @@
#include "NACLantispam.h"
#include "rlvhandler.h"
#include "streamtitledisplay.h"
#include "fscommon.h"
#include "tea.h"
//
@ -1501,6 +1502,12 @@ 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>
display_startup();
// We should have an agent id by this point.
llassert(!(gAgentID == LLUUID::null));