diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
| commit | f1beac1a70e74bef5caf4850bd9146a583e00739 (patch) | |
| tree | 04dcca497b5b93d18d2b2cd093fa5fc3b2393925 /indra/newview | |
| parent | 9a7f79cbcf57c46e797d2e5626d534055f9a256d (diff) | |
| parent | dce043b3177eb9a7d017af2a7e9f889a18668e77 (diff) | |
Merge from remote repo
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; |