@@ -818,8 +818,8 @@ bool idle_startup()
818818 if (STATE_BROWSER_INIT == LLStartUp::getStartupState ())
819819 {
820820 LL_DEBUGS (" AppInit" ) << " STATE_BROWSER_INIT" << LL_ENDL ;
821- std::string msg = LLTrans::getString (" LoginInitializingBrowser" );
822- set_startup_status (0 .03f , msg.c_str (), gAgent .mMOTD .c_str ());
821+ // std::string msg = LLTrans::getString("LoginInitializingBrowser");
822+ // set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
823823 display_startup ();
824824 // LLViewerMedia::initBrowser();
825825 LLStartUp::setStartupState ( STATE_LOGIN_SHOW );
@@ -2881,6 +2881,7 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
28812881}
28822882
28832883
2884+ LLColor4 get_text_color (const LLChat& chat, bool from_im = false ); // llfloaterchat.cpp
28842885
28852886void set_startup_status (const F32 frac, const std::string& string, const std::string& msg)
28862887{
@@ -2894,12 +2895,17 @@ void set_startup_status(const F32 frac, const std::string& string, const std::st
28942895 LLChat chat;
28952896 chat.mText = new_d;
28962897 chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT +1 );
2897- LLFloaterChat::addChat (chat);
2898+ if (gConsole )
2899+ gConsole ->addConsoleLine (chat.mText , gSavedSettings .getColor4 (" SystemChatColor" ));
2900+ LLFloaterChat::addChatHistory (chat,false );
2901+
28982902 if (new_d == LLTrans::getString (" LoginWaitingForRegionHandshake" ))
28992903 {
29002904 chat.mText = " MOTD: " +msg;
29012905 chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT +1 );
2902- LLFloaterChat::addChat (chat);
2906+ if (gConsole )
2907+ gConsole ->addConsoleLine (chat.mText , gSavedSettings .getColor4 (" SystemChatColor" ));
2908+ LLFloaterChat::addChatHistory (chat,false );
29032909 }
29042910 }
29052911 }
0 commit comments