diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
| commit | 07de4edbc45de93c04bc4d0a7c174a45c902b50f (patch) | |
| tree | 14d90da452bb109e6f94567f057fac5f41ef0cf0 /indra/llrender | |
| parent | 2edbd733843d5ad0f9ec3dec49e676651bda07af (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |