diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
| commit | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (patch) | |
| tree | beff520bbdca9f7a8aeeb7d4fc21b4a16b8b510c /indra/llrender/llfontgl.cpp | |
| parent | 88407a0f0c19f1ee36c176f2fdc2117646d65b80 (diff) | |
| parent | bde49506e5b1a854f832f6f47781eac35853b1a0 (diff) | |
merge latest builds from project integration repo
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; |