diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-02-08 19:13:33 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-02-08 19:13:33 +0200 |
| commit | b98351d1956093d1672c5b8efe2728b2206525c6 (patch) | |
| tree | e93201be17a48aac2f6e2b8e0eaac77db3d16fc6 /indra/llrender | |
| parent | acc0a2962bc645335f19bb5e6142690ea99df449 (diff) | |
| parent | d60d73a9e09dac3fa4508d8eddb8202614ff3536 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llrender')
| -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() |