diff options
| author | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
| commit | c4c8e13ac5f555a5b9257582bcc8c3494be1de5d (patch) | |
| tree | 897327da900fb002065b1e2f01f213333115d556 /indra/llrender | |
| parent | dbd619508ba45292c2cebe096494c28e74941643 (diff) | |
| parent | 017da5453e92170ba37e93f364f30a9ccfbff202 (diff) | |
merge
Diffstat (limited to 'indra/llrender')
| -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; |