diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
| commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
| tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/llrender | |
| parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
| parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) | |
Automated merge
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 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; |