diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
| commit | dce043b3177eb9a7d017af2a7e9f889a18668e77 (patch) | |
| tree | 1029565038ae3e23ee4e96e8432cb28ff80ba83c /indra/newview | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (diff) | |
Merge from branch-test (EXT-1279)
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; |