diff -r 46c7b36793c9 -r ad4d14b6f6dc doc/contributions.txt --- a/doc/contributions.txt Fri Jul 30 15:17:32 2010 -0700 +++ b/doc/contributions.txt Thu Jul 21 10:54:22 2011 +0200 @@ -668,12 +668,15 @@ 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 -r 46c7b36793c9 -r ad4d14b6f6dc indra/llrender/llfontgl.cpp --- a/indra/llrender/llfontgl.cpp Fri Jul 30 15:17:32 2010 -0700 +++ b/indra/llrender/llfontgl.cpp Thu Jul 21 10:54:22 2011 +0200 @@ -195,6 +195,9 @@ 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;