diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-12 19:40:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-12 19:40:00 -0700 |
| commit | c594e848656f2bc1d29c48b7ceae782b5d542ad2 (patch) | |
| tree | c668283967304a5e84e0b8d72a07511d5e842e2b /indra/llrender | |
| parent | cb6574c905806feac3846733ca0ead77e431beb1 (diff) | |
| parent | e7a4cce3566988d5b58dc070196a32844d705318 (diff) | |
Pull merge from lindenlab/viewer-chui
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 |