diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-23 15:17:05 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-23 15:17:05 -0500 |
| commit | ce86efac3df1ed568ecac0ffcf38dce94bb3f1d4 (patch) | |
| tree | bd5d26c2e44bc9e03921c8e82029b20fabd0b4c5 /indra/llrender/llfontgl.cpp | |
| parent | 5c8b2deb82cfe753d6fe25e418f99f05d76e0b73 (diff) | |
| parent | 3a852170556cd4104dc7822140533d81d46b644d (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 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(); |