Commits

Scott Lawrence committed 2abe3bc Merge

merge changes for VWR-25588

  • Participants
  • Parent commits 7a04e93, 46ef889

Comments (0)

Files changed (2)

doc/contributions.txt

 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

indra/llrender/llfontgl.cpp

 	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;