diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-15 14:51:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-15 14:51:21 -0400 |
| commit | 832d972fe86325bfafad542c7c548dbecaf5ee65 (patch) | |
| tree | 85d0a25e92646ebbc8f0cf5ee02da13573334233 /indra/llrender | |
| parent | 5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff) | |
| parent | b21e63cc1260b1b8db87f52fb9b7a2f80b055327 (diff) | |
merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 180ae4dfa6..607473d416 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -189,6 +189,9 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons origin.mV[VX] -= llround((F32)sCurOrigin.mX) - (sCurOrigin.mX); origin.mV[VY] -= llround((F32)sCurOrigin.mY) - (sCurOrigin.mY); + // Depth translation, so that floating text appears 'inworld' + // and is correclty occluded. + gGL.translatef(0.f,0.f,sCurOrigin.mZ); S32 chars_drawn = 0; S32 i; |