diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-15 12:21:59 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-15 12:21:59 -0400 |
| commit | 45036820f85844093f3a2031cff10c6633926da4 (patch) | |
| tree | ff20e352f2510e0945e29d2cd9bcba0957968fef /indra/llrender | |
| parent | 91eb63bdde50d3a75908909af0e23d54f5c2fd21 (diff) | |
| parent | 0bee6c278ca6acd89f33bf0b32a80f1eaded7db4 (diff) | |
merged .hgtags
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; |