diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
| commit | 85c4d40614b501d401159b9bb064a4f4c726265e (patch) | |
| tree | ef610b296660a2969d4df60ef331a3b4b411b676 /indra/llui/llconsole.cpp | |
| parent | a68b34eadf99c5875f2d7692185706e490e850bd (diff) | |
| parent | b0dccf883ad67e43b9fac5bc81f7b79bf9c07f8c (diff) | |
merge
Diffstat (limited to 'indra/llui/llconsole.cpp')
| -rw-r--r-- | indra/llui/llconsole.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 285ce82d2d..e0053b4cc7 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -120,6 +120,11 @@ void LLConsole::setFontSize(S32 size_index) { mFont = LLFontGL::getFontSansSerifHuge(); } + // Make sure the font exists + if (mFont == NULL) + { + mFont = LLFontGL::getFontDefault(); + } for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++) { |