From 66b7ca4e2799410a839bcfb2e207b07394d9392b Mon Sep 17 00:00:00 2001 From: Cinders Date: Sun, 24 Mar 2013 13:09:34 -0600 Subject: [PATCH] FIRE-8571, FIRE-9274 - Only show FS MOTD on agni. FS MOTD is usually agni/SL centric and important grid messages are missed. --- indra/newview/llstartup.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index eac183998d..2a4c77ae38 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3730,7 +3730,9 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y } // If MOTD has not been set by fsdata, fallback to LL MOTD - if (gAgent.mMOTD.empty()) +// FIRE-8571, FIRE-9274 + if (gAgent.mMOTD.empty() || !LLGridManager::getInstance()->isInSLMain()) +// { gAgent.mMOTD.assign(response["message"]); }