diff options
| author | Richard Linden <none@none> | 2010-03-23 12:50:53 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-23 12:50:53 -0700 |
| commit | 75370837c11ec5f62aadcd7f364c4db93764ca8a (patch) | |
| tree | 9e5c04556a9c2489dc7c8894e6769359a7c8ad5c /indra/llrender/llfontgl.cpp | |
| parent | eb91c97d6046ee1255f8b9b7d86826e0045dee98 (diff) | |
| parent | e3e50bf7ed48c6ee0a199d27fce7ba888793429d (diff) | |
merge
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; |