diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 09:43:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 09:43:38 -0400 |
| commit | 91ac6b16f52e09aa93cb66ed6ead38496427d08c (patch) | |
| tree | 09d05732ae70a5e101093f93343a429d23662c50 | |
| parent | a2dc2317a6a9cf30a524b185c33144072921948f (diff) | |
| parent | 5774bac296d746d9ad15d0013569356c168ad2b2 (diff) | |
merge changes for VWR-25588
| -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 388ea31c0b..0cdf37d72f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1195,12 +1195,15 @@ Zarkonnen Decosta Zeja Pyle ZenMondo Wormser 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; |