summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontfreetype.cpp
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-05-13 18:17:16 +0300
committermaxim_productengine <mnikolenko@productengine.com>2019-05-13 18:17:16 +0300
commitf46969fec7ef4b2c7e4430d3d94a649cce337891 (patch)
tree8369d611c6d95eb3d82c5ee024ca861a5b36f982 /indra/llrender/llfontfreetype.cpp
parent7fa0e188929f636ab6b6ce846b3785b8c1abdf2a (diff)
SL-11139 FIXED LLFontGL::getStringFromStyle() never return "NORMAL"
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
-rw-r--r--indra/llrender/llfontfreetype.cpp2
1 files changed, 0 insertions, 2 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;