diff options
| author | Richard Linden <none@none> | 2011-05-25 18:11:50 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-25 18:11:50 -0700 |
| commit | 55a9991812a1f58774fe9b885f588dafcb52d2af (patch) | |
| tree | 2f134a3ff61cf8d28ba50130b95602f687806479 /indra/llrender/llfontgl.cpp | |
| parent | e6ecf1ee7ea73139fa134fb6bc6e0088009c9f7e (diff) | |
| parent | a8405dea54c80efa32010c6835b910bdd0065573 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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 13008292f6..62aa49d235 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -555,7 +555,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; |