summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontfreetype.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-14 14:31:25 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-14 14:31:25 -0700
commit562006aa5585a42418cae978516505035cd34d8d (patch)
treef42488d1b07907937f5b9e236617d9f02297d32d /indra/llrender/llfontfreetype.cpp
parent9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff)
parent7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff)
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
-rw-r--r--indra/llrender/llfontfreetype.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 0be6bedbee..44e997340e 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -533,6 +533,7 @@ void LLFontFreetype::renderGlyph(U32 glyph_index) const
void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
{
+ resetBitmapCache();
if (!mIsFallback)
{
// This is the head of the list - need to rebuild ourself and all fallbacks.
@@ -552,7 +553,6 @@ void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
}
}
}
- resetBitmapCache();
}
void LLFontFreetype::resetBitmapCache()
@@ -568,7 +568,7 @@ void LLFontFreetype::resetBitmapCache()
}
mFontBitmapCachep->reset();
- // Add the empty glyph`5
+ // Add the empty glyph
addGlyph(0, 0);
}