diff options
author | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
commit | 8538c0f35dc5fb780f02930256e627e5266ede4a (patch) | |
tree | 58950646aae6534fafe680a5cf879d01cd99d254 /linden/indra/llrender/llfontgl.cpp | |
parent | Second Life viewer sources 1.20.5 (diff) | |
download | meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.zip meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.gz meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.bz2 meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.xz |
Second Life viewer sources 1.20.6
Diffstat (limited to 'linden/indra/llrender/llfontgl.cpp')
-rw-r--r-- | linden/indra/llrender/llfontgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp index 53e8c2b..938dd73 100644 --- a/linden/indra/llrender/llfontgl.cpp +++ b/linden/indra/llrender/llfontgl.cpp | |||
@@ -845,7 +845,7 @@ S32 LLFontGL::render(const LLWString &wstr, | |||
845 | if (style & UNDERLINE) | 845 | if (style & UNDERLINE) |
846 | { | 846 | { |
847 | LLGLSNoTexture no_texture; | 847 | LLGLSNoTexture no_texture; |
848 | gGL.begin(GL_LINES); | 848 | gGL.begin(LLVertexBuffer::LINES); |
849 | gGL.vertex2f(start_x, cur_y - (mDescender)); | 849 | gGL.vertex2f(start_x, cur_y - (mDescender)); |
850 | gGL.vertex2f(cur_x, cur_y - (mDescender)); | 850 | gGL.vertex2f(cur_x, cur_y - (mDescender)); |
851 | gGL.end(); | 851 | gGL.end(); |
@@ -1340,7 +1340,7 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con | |||
1340 | F32 slant_offset; | 1340 | F32 slant_offset; |
1341 | slant_offset = ((style & ITALIC) ? ( -mAscender * 0.2f) : 0.f); | 1341 | slant_offset = ((style & ITALIC) ? ( -mAscender * 0.2f) : 0.f); |
1342 | 1342 | ||
1343 | gGL.begin(GL_QUADS); | 1343 | gGL.begin(LLVertexBuffer::QUADS); |
1344 | { | 1344 | { |
1345 | //FIXME: bold and drop shadow are mutually exclusive only for convenience | 1345 | //FIXME: bold and drop shadow are mutually exclusive only for convenience |
1346 | //Allow both when we need them. | 1346 | //Allow both when we need them. |