diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
| commit | e23228fef2834587af490d0345f29212445666d8 (patch) | |
| tree | dfa761027aca1227ec1817707f8141b833c061df /indra/llrender/llfontgl.cpp | |
| parent | c880c961bb2a0838bc529efc07cfeb12f5636d88 (diff) | |
| parent | 8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff) | |
merge 3.5.0-release
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 647512eb2e..8772779645 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -599,6 +599,11 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch if(!fgi) { fgi = mFontFreetype->getGlyphInfo(wch); + + if (NULL == fgi) + { + return 0; + } } // account for glyphs that run beyond the starting point for the next glyphs |