From cf2bd13dfe5a61ee7f1dcbae13693bfda4f75f2c Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <none@none>
Date: Sun, 23 Jun 2013 22:22:27 -0400
Subject: [PATCH] FIRE-6643 Display MOTD when login screens are disabled.

---
 indra/newview/llstartup.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 988af7c704..a56057c0bc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -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));