summaryrefslogtreecommitdiff
path: root/indra/llui/llconsole.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-26 09:59:39 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-26 09:59:39 -0700
commitd6e8f32b8073d85db59f2a45a10d622b71c859ae (patch)
tree953c5efd60338604c229824467270cd8d5a458ce /indra/llui/llconsole.cpp
parentadd9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff)
parent53c972a521cbb92c6c9390c41b250a41dc22cd5a (diff)
merge
Diffstat (limited to 'indra/llui/llconsole.cpp')
-rw-r--r--indra/llui/llconsole.cpp5
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++)
{