diff options
| author | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
| commit | 2595d53ded032964623007fa957510d5f1570e29 (patch) | |
| tree | 02b24547a3ca408298b58373f106bb9862fea4be /indra/llrender | |
| parent | fda331bb801918aab3eb5b7026f7e868eca248a2 (diff) | |
| parent | 55a9991812a1f58774fe9b885f588dafcb52d2af (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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; |