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

FIRE-8571, FIRE-9274 - Only show FS MOTD on agni. FS MOTD is usually agni/SL centric and important grid messages are missed.

Cinders 2013-03-24 13:09:34 -06:00
parent a9912d7390
commit 66b7ca4e27
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llstartup.cpp
View File

@ -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())
// <FS:CR> FIRE-8571, FIRE-9274
if (gAgent.mMOTD.empty() || !LLGridManager::getInstance()->isInSLMain())
// </FS:CR>
{
gAgent.mMOTD.assign(response["message"]);
}