diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
| commit | 2c9a914d7d45b056c845f5b7dba6713ff5c597ae (patch) | |
| tree | f51dc1ff803a43e980c574d556076eed8717e161 /indra/llrender/llfontgl.cpp | |
| parent | 19250ff490eba3ef5e713e10eed4243150691f25 (diff) | |
| parent | d034bdcae74225af23ae29fbe9ba4a78ac7de5a7 (diff) | |
merge changes for storm-1318
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; |