diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
| commit | 65bf35cfed4b67d5f27628144f7519c81bd97dac (patch) | |
| tree | 8ca423d53d3105133e40e7bd7d3aaea3f0528023 /indra/newview/llfolderviewitem.cpp | |
| parent | 6c1706da69193de3ddbaf69a40e5ba0cad13283e (diff) | |
| parent | fce70328535ec04aba64972f47cface0b2fd3046 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -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 0d74641c5f..9208beec9e 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -71,6 +71,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; |