diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
| commit | f2948cb1eb8866716a84868cccbfafcd742c0771 (patch) | |
| tree | 394df20f229f87428252c02d2402c511b9fa7aa8 /indra/llrender/llfontgl.cpp | |
| parent | 779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff) | |
| parent | 4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff) | |
Merge with viewer-chui
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 |