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/llrender/llfontregistry.cpp | |
| parent | 9a7f79cbcf57c46e797d2e5626d534055f9a256d (diff) | |
| parent | dce043b3177eb9a7d017af2a7e9f889a18668e77 (diff) | |
Merge from remote repo
Diffstat (limited to 'indra/llrender/llfontregistry.cpp')
| -rw-r--r-- | indra/llrender/llfontregistry.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 45573cd817..7a3d6ec4f2 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -380,7 +380,10 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) LLFontDescriptor nearest_exact_desc = *match_desc; nearest_exact_desc.setSize(norm_desc.getSize()); font_reg_map_t::iterator it = mFontMap.find(nearest_exact_desc); - if (it != mFontMap.end()) + // If we fail to find a font in the fonts directory, it->second might be NULL. + // We shouldn't construcnt a font with a NULL mFontFreetype. + // This may not be the best solution, but it at least prevents a crash. + if (it != mFontMap.end() && it->second != NULL) { llinfos << "-- matching font exists: " << nearest_exact_desc.getName() << " size " << nearest_exact_desc.getSize() << " style " << ((S32) nearest_exact_desc.getStyle()) << llendl; |