diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
| commit | a625dbe35ebaf63ad093aedce49a042ee790fe3c (patch) | |
| tree | f78e643bae9590262bce94681376254436140e2c /indra/llrender | |
| parent | 75722baf295aff7927bff3c70cdf0ec27399cb37 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3
Diffstat (limited to 'indra/llrender')
| -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 |