diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-16 17:52:25 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-16 17:52:25 -0400 |
| commit | 1f97cca85678a8b79d718aeb2de8590eb3865076 (patch) | |
| tree | fb8d9eace43b1e42775efacb0a6e44465e65a39f /indra/llrender/llfontgl.cpp | |
| parent | 53187303436d06038e40c5938219863c0d75ae5f (diff) | |
| parent | 0301feb80bbf23d65cfd1ddbe22f297c3ff61a48 (diff) | |
merging latest mesh-development.
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -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; |