diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
| commit | c2915a889987e64484c9794d55740e7f6ac8f9bd (patch) | |
| tree | e09a6050829fbc4b1f8fdae03f6c12742ba903ed /indra/llrender | |
| parent | 1e9a5c21e5493ad3dabec4d032bc0a627e2f725f (diff) | |
| parent | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (diff) | |
Merge viewer-2-0 into gooey
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 7ad5f9608f..37a28ac721 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -135,7 +135,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons S32 scaled_max_pixels = max_pixels == S32_MAX ? S32_MAX : llceil((F32)max_pixels * sScaleX); - // determine which style flags need to be added programmatically by striping off the + // determine which style flags need to be added programmatically by stripping off the // style bits that are drawn by the underlying Freetype font U8 style_to_add = (style | mFontDescriptor.getStyle()) & ~mFontFreetype->getStyle(); |