aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llfont.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/llrender/llfont.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to '')
-rw-r--r--linden/indra/llrender/llfont.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 2ca1984..965e2d9 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -535,6 +535,8 @@ void LLFont::renderGlyph(const U32 glyph_index) const
535 int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT ); 535 int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT );
536 llassert(!error); 536 llassert(!error);
537 537
538 // Work around the compiler warning about error not being used when llassert() is compiled out.
539 error = error + 0;
538 error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode); 540 error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode);
539 541
540 mRenderGlyphCount++; 542 mRenderGlyphCount++;