diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-07-21 11:02:30 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-07-21 11:02:30 +0200 |
| commit | 5774bac296d746d9ad15d0013569356c168ad2b2 (patch) | |
| tree | c7bbf0e13c3642e8acbd24b4a33a5e02255c0b5f | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | 1a1a4beb52eb8f9ca11861e7787603bf585026f7 (diff) | |
merged VWR-25588 fix (hovertext occlusion)
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 68b0a4279f..c5ad33b788 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -926,12 +926,15 @@ Zai Lynch Zarkonnen Decosta VWR-253 Zi Ree + SH-489 VWR-423 VWR-671 VWR-682 VWR-684 VWR-9127 VWR-1140 + VWR-24017 + VWR-25588 Zipherius Turas VWR-76 VWR-77 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; |