diff options
| author | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
| commit | 45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (patch) | |
| tree | 4fe43929cb518d67e8afbd227db3bc62e4d175e5 /indra/llrender/llfontgl.cpp | |
| parent | 694b0838bc80efc152e7ecda09ffdc7a944b7079 (diff) | |
| parent | 12d9d1d3ef76518171ae87aae2467593218f8413 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index d6a31dc862..180ae4dfa6 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -554,7 +554,7 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch BOOL in_word = FALSE; // avoid S32 overflow when max_pixels == S32_MAX by staying in floating point - F32 scaled_max_pixels = ceil(max_pixels * sScaleX); + F32 scaled_max_pixels = max_pixels * sScaleX; F32 width_padding = 0.f; LLFontGlyphInfo* next_glyph = NULL; |