diff options
| author | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-21 11:21:45 -0400 |
| commit | f3457461617119bda93f506977170cb8f15a270d (patch) | |
| tree | d4b9e45586725447ef939b6876c7d19d7ff9f573 /indra/llrender/llfontgl.cpp | |
| parent | 33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (diff) | |
| parent | f2948cb1eb8866716a84868cccbfafcd742c0771 (diff) | |
Folded in changes from sunshine-stable
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 a28acade61..c4f36cabd0 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -598,6 +598,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 |