diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
| commit | d1efc0fd52c0e5dc59951f50435e121305fe9b69 (patch) | |
| tree | 7ac48a54efc4029b44a6743b08d351ecfd947801 /indra/llrender | |
| parent | 4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff) | |
| parent | c9b27bec33d601330afe854d0322d22fce9da76a (diff) | |
merge from viewer2 trunk.
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() |