diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 13:53:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 13:53:02 -0400 |
| commit | 5ce0d30ec91a35ed1e32a957597758502a966b9c (patch) | |
| tree | 9a6c4b04b4c3d7bb3141846d69d4efd158ef228c /indra/llrender | |
| parent | 17edcc939a49d36415d3cfdd9b8c213ebb83a537 (diff) | |
| parent | 4a8109476cfdb1505e9dc122526caacd6cdda374 (diff) | |
reconciled .hgtags
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; |