diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-23 15:31:58 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-23 15:31:58 -0700 |
| commit | ed8fa8ab3b05e91f967e6ccb4d5428e799f8f262 (patch) | |
| tree | 70b053acb1421e9ffcf51dc543d95535925ea8b7 /indra/llrender/llfontgl.cpp | |
| parent | 9231d480b45e39fbed067215acce6febdd9d443a (diff) | |
| parent | 3d77520e13a45e68e346582bed48493db7d856ea (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; |