diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
| commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
| tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/llrender/llfontgl.cpp | |
| parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
Merged lindenlab/viewer-development into default
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 |