diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
| commit | 62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch) | |
| tree | dd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/llrender/llfontgl.cpp | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | ea8f1b80df0fcfcdbb52123b2ece68916ed139ff (diff) | |
Merge from viewer-2-0
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 768f042e69..d9e1976341 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -673,7 +673,7 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t target_x *= sScaleX; // max_chars is S32_MAX by default, so make sure we don't get overflow - const S32 max_index = begin_offset + llmin(S32_MAX - begin_offset, max_chars); + const S32 max_index = begin_offset + llmin(S32_MAX - begin_offset, max_chars - 1); F32 scaled_max_pixels = max_pixels * sScaleX; |