diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-08 18:01:45 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-08 18:01:45 +0200 |
| commit | a35d61a6ec2545940f69b10e3e9111f21010a30a (patch) | |
| tree | 3dafdf89a71f41d52a7155a5cec6206a80d5c24f /indra | |
| parent | ae2cbf2df8f7eec32e184b761edaf33334d27e98 (diff) | |
Fixed critical bug EXT-4971 (Crash when attemping to change UI size)
- Adding default glyph for fallback fonts is now skipped in LLFontFreetype::resetBitmapCache().
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -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() |