diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
| commit | 127b428863707c882fbf4d30699321b8a2365644 (patch) | |
| tree | 728c98bd177635891f0646ccabcf86b70341d4a0 /indra/newview/llfolderviewitem.cpp | |
| parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
| parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (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 3591daf92d..f83a426cda 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; |