diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 18:14:57 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 18:14:57 +0000 |
| commit | 3ab0c3238bec95863784850d2a95e9c09afce539 (patch) | |
| tree | 86e5788c95caf5553a0015e152bcf0a6c5d5cd1b /indra/llrender/llfontfreetype.cpp | |
| parent | ac59a7c130f3fcbbb8f228bdf69c44ffa09f07a2 (diff) | |
| parent | 6b92b866e49408622ed02b85a0518b01cdbcf7a9 (diff) | |
PE merge.
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 59e7d890f4..22fad792da 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -504,8 +504,13 @@ void LLFontFreetype::resetBitmapCache() mCharGlyphInfoMap.clear(); mFontBitmapCachep->reset(); - // Add the empty glyph - addGlyphFromFont(this, 0, 0); + // Adding default glyph is skipped for fallback fonts here as well as in loadFace(). + // This if was added as fix for EXT-4971. + if(!mIsFallback) + { + // Add the empty glyph + addGlyphFromFont(this, 0, 0); + } } void LLFontFreetype::destroyGL() |