diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:14:20 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:14:20 -0700 |
| commit | cf4355851606c996ed8269ac709c8eaa5c9ccdef (patch) | |
| tree | aa465be3aeef1d70da09bc9bb37cc7f3ca4f185a /indra/llrender | |
| parent | 504fabba1d8d2ffd1d3c43368cbd1a8522ca2ebc (diff) | |
| parent | e84f9acf761bd60a558682e87e053207bc9bc014 (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; |