diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-06 11:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-06 11:40:10 -0400 |
| commit | 336d3c15c426f1f29b85ed67d8fe5db93c2cc148 (patch) | |
| tree | 0904f442600a14d0569668663df61ecf7ac067a8 /indra/llrender/llfontgl.cpp | |
| parent | bbc1283848e01bfd5284293d044eec53cde10d0e (diff) | |
| parent | 7a7c6860e523a53285acda408d7798ffcd892778 (diff) | |
merge changes for viewer-development
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; |