Skip to content

#5726 Crash initing in-viewer console #5727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akleshchev merged 1 commit into from
Apr 28, 2026
+11 −0
Merged

#5726 Crash initing in-viewer console #5727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions indra/llui/llconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ LLConsole::LLConsole(const LLConsole::Params& p)
{
setFontSize(p.font_size_index);
}
if (mFont == nullptr)
{
setFontSize(0); // sans-serif
}
mFadeTime = mLinePersistTime - FADE_DURATION;
setMaxLines(LLUI::getInstance()->mSettingGroups["config"]->getS32("ConsoleMaxLines"));
}
Expand All @@ -79,6 +83,13 @@ void LLConsole::setLinePersistTime(F32 seconds)

void LLConsole::reshape(S32 width, S32 height, bool called_from_parent)
{
if (mFont == nullptr)
{
// not initialized yet
LL_WARNS() << "LLConsole::reshape called before font is set" << LL_ENDL;
return;
}

S32 new_width = llmax(50, llmin(getRect().getWidth(), width));
S32 new_height = llmax(mFont->getLineHeight() + 15, llmin(getRect().getHeight(), height));

Expand Down
Loading