diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-05-13 18:17:16 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-05-13 18:17:16 +0300 |
| commit | f46969fec7ef4b2c7e4430d3d94a649cce337891 (patch) | |
| tree | 8369d611c6d95eb3d82c5ee024ca861a5b36f982 | |
| parent | 7fa0e188929f636ab6b6ce846b3785b8c1abdf2a (diff) | |
SL-11139 FIXED LLFontGL::getStringFromStyle() never return "NORMAL"
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index e9d852c288..c41730ebaa 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -245,13 +245,11 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v if(mFTFace->style_flags & FT_STYLE_FLAG_BOLD) { mStyle |= LLFontGL::BOLD; - mStyle &= ~LLFontGL::NORMAL; } if(mFTFace->style_flags & FT_STYLE_FLAG_ITALIC) { mStyle |= LLFontGL::ITALIC; - mStyle &= ~LLFontGL::NORMAL; } return TRUE; diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index b79615e730..86a4c35e6d 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -870,10 +870,6 @@ void LLFontGL::destroyAllGL() U8 LLFontGL::getStyleFromString(const std::string &style) { S32 ret = 0; - if (style.find("NORMAL") != style.npos) - { - ret |= NORMAL; - } if (style.find("BOLD") != style.npos) { ret |= BOLD; @@ -893,7 +889,7 @@ U8 LLFontGL::getStyleFromString(const std::string &style) std::string LLFontGL::getStringFromStyle(U8 style) { std::string style_string; - if (style & NORMAL) + if (style == NORMAL) { style_string += "|NORMAL"; } |