diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-24 16:36:14 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-24 16:36:14 +0200 |
| commit | 9c90822c9d5409f267c5d457489a6fd295dabd2a (patch) | |
| tree | e1e3d01b559727b62382afb25edfa6e541c73f2a /indra/llrender | |
| parent | 2c7e5b91001a981809803adbe8490c756ab8bfc6 (diff) | |
| parent | ed29d709c8aa308fca8bf84c84b02157f86c66c1 (diff) | |
merge
--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 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(); |