diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-06 11:52:37 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-06 11:52:37 -0400 |
| commit | 18d210e9b0adb90ab2bdac863435bd1c3a9d7abf (patch) | |
| tree | 58496f4e9ebadb36fa5210bfcbc69f1a85421a86 /indra/llrender | |
| parent | db2d21a89b62acc14025e7c529721e994ca96a9f (diff) | |
| parent | 02c85bd02689b773b1a861c4edff865a31986b4f (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; |