diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-24 16:30:10 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-24 16:30:10 +0200 |
| commit | ed802c19ce958849eeabc1d125e684fb8a0a4caa (patch) | |
| tree | 01ba4cac397e7976cc75ac3c089fb4e44296fda4 /indra/llrender | |
| parent | a1528c45594e5fc57eb956c853126f9d9f3fc387 (diff) | |
| parent | b518a3a5f0d13a6dedfcd60918369076b48f5ece (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 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(); |