diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
| commit | bd95e64d3da1b90b37e88e31979cc8f227d5cc58 (patch) | |
| tree | fff84f4075cb34a3fdd589bf399e47bebb8bc17d /indra/llrender | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Set hotfix build params for Release.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llfontregistry.cpp | 2 |
2 files changed, 3 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; diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 7a3d6ec4f2..e619f89e1d 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -469,6 +469,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) else { fontlist.push_back(fontp->mFontFreetype); + delete fontp; + fontp = NULL; } } } |