diff options
| author | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
| commit | b6d973d31380e7d35f7ed014d682dfc5f2465afe (patch) | |
| tree | 2a67c0e80831528f2cc3141a580a3a5545cc1d85 /indra/llrender/llfontgl.cpp | |
| parent | 8b388922434e431c49b9e7f2c9d1e8d90d15ed21 (diff) | |
| parent | 8904f32ba48b49ec216a3ca3b1508d5f3f633e78 (diff) | |
merge
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 |