diff options
| author | Richard Linden <none@none> | 2012-01-27 19:55:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-27 19:55:42 -0800 |
| commit | 3249a1ced0a4d0bc45d04f5794c989e12e62033b (patch) | |
| tree | c2ea68941e0f8a8c34aa623f8db75f2a634699b5 /indra/llrender | |
| parent | 84b7ff7915207dffad8da7aba959ab36bfa49c0f (diff) | |
| parent | 22a6170a7b19b3a6f44536b7552b633416348775 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index a469581637..7d827ae483 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -219,10 +219,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons switch (valign) { case TOP: - cur_y -= mFontFreetype->getAscenderHeight(); + cur_y -= llceil(mFontFreetype->getAscenderHeight()); break; case BOTTOM: - cur_y += mFontFreetype->getDescenderHeight(); + cur_y += llceil(mFontFreetype->getDescenderHeight()); break; case VCENTER: cur_y -= (mFontFreetype->getAscenderHeight() - mFontFreetype->getDescenderHeight()) / 2.f; |