diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-16 14:51:37 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-16 14:51:37 +0300 |
| commit | 8a84ec93fc369c26315f26fa2ec5ddf7733700c9 (patch) | |
| tree | 13d9cb5f67ed32da01cfbee08601e2bc0e8bdd9a /indra/llrender | |
| parent | fecec49081419dbd7a66533e4d0457784b8d26a0 (diff) | |
| parent | 0301feb80bbf23d65cfd1ddbe22f297c3ff61a48 (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; |