Don't instantiate LLTextParser::getInstance before user logged in.
This commit is contained in:
committed by
Siana Gearz
parent
2ceebebb49
commit
f297068ec0
@@ -456,6 +456,14 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool fo
|
||||
LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_time)
|
||||
: mParagraphText(str), mAddTime(add_time), mMaxWidth(-1)
|
||||
{
|
||||
makeParagraphColorSegments(color);
|
||||
// Only call makeParagraphColorSegments if the user logged in already (we come
|
||||
// here before he logged in when they disabled login/logout screens).
|
||||
// Otherwise makeParagraphColorSegments calls LLTextParser::getInstance() which
|
||||
// causes a one-time initialization by reading highlights.xml, which fails
|
||||
// when not logged in because it's per account.
|
||||
if (!gDirUtilp->getLindenUserDir(true).empty())
|
||||
{
|
||||
makeParagraphColorSegments(color);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user