diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
| commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
| tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/llrender | |
| parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (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; |