diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 15:52:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 15:52:35 -0400 |
| commit | 58e8ee5f9169818894f34bf1bfdd4efe46482e37 (patch) | |
| tree | a245dd8f468343c9a1ddd57fe1a3156338846f93 /indra/llrender/llfontgl.cpp | |
| parent | 4ebfc47e40692b16a057321a9c8b6f28e1601cdd (diff) | |
| parent | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (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; |