diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:14:46 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:14:46 -0700 |
| commit | 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (patch) | |
| tree | 96e7e8d1ac31027c04a964a7c16c16ef3a0df6ba /indra/newview | |
| parent | 47e02d13f7e6307d9eb507177b88bbf0ab496894 (diff) | |
EXT-1279 Crash if font file not found.
Added getFontDefault() to llfontgl.h
--HG--
branch : branch-test
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index ee5fba5ace..ea1275aad1 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -70,6 +70,10 @@ LLFontGL* LLFolderViewItem::getLabelFontForStyle(U8 style) { LLFontDescriptor labelfontdesc("SansSerif", "Small", style); rtn = LLFontGL::getFont(labelfontdesc); + if (!rtn) + { + rtn = LLFontGL::getFontDefault(); + } sFonts[style] = rtn; } return rtn; |