Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lazy startup crash fix. Do we really care about a browser init message, especially before the UI is even initialized? I'd say probably not.

Browse Source
This commit is contained in:
Shyotl
2013-08-01 02:31:20 -05:00
parent d956f60c0b
commit 52f6c5830c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llstartup.cpp
View File

@@ -818,8 +818,8 @@ bool idle_startup()
if (STATE_BROWSER_INIT == LLStartUp::getStartupState()) if (STATE_BROWSER_INIT == LLStartUp::getStartupState())
{ {
LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL; LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL;
std::string msg = LLTrans::getString("LoginInitializingBrowser"); //std::string msg = LLTrans::getString("LoginInitializingBrowser");
set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str()); //set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
display_startup(); display_startup();
// LLViewerMedia::initBrowser(); // LLViewerMedia::initBrowser();
LLStartUp::setStartupState( STATE_LOGIN_SHOW ); LLStartUp::setStartupState( STATE_LOGIN_SHOW );
@@ -2881,6 +2881,7 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
} }
LLColor4 get_text_color(const LLChat& chat, bool from_im = false); //llfloaterchat.cpp
void set_startup_status(const F32 frac, const std::string& string, const std::string& msg) void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
{ {
@@ -2894,12 +2895,17 @@ void set_startup_status(const F32 frac, const std::string& string, const std::st
LLChat chat; LLChat chat;
chat.mText = new_d; chat.mText = new_d;
chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1); chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1);
LLFloaterChat::addChat(chat); if(gConsole)
gConsole->addConsoleLine(chat.mText, gSavedSettings.getColor4("SystemChatColor"));
LLFloaterChat::addChatHistory(chat,false);
if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake")) if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake"))
{ {
chat.mText = "MOTD: "+msg; chat.mText = "MOTD: "+msg;
chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1); chat.mSourceType = (EChatSourceType)(CHAT_SOURCE_OBJECT+1);
LLFloaterChat::addChat(chat); if(gConsole)
gConsole->addConsoleLine(chat.mText, gSavedSettings.getColor4("SystemChatColor"));
LLFloaterChat::addChatHistory(chat,false);
} }
} }
} }