Skip to content
Snippets Groups Projects
Commit 91ac6b16 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for VWR-25588

parents a2dc2317 5774bac2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 3
− 0
View file @ 91ac6b16
...@@ -1195,12 +1195,15 @@ Zarkonnen Decosta ...@@ -1195,12 +1195,15 @@ Zarkonnen Decosta
Zeja Pyle Zeja Pyle
ZenMondo Wormser ZenMondo Wormser
Zi Ree Zi Ree
SH-489
VWR-423 VWR-423
VWR-671 VWR-671
VWR-682 VWR-682
VWR-684 VWR-684
VWR-9127 VWR-9127
VWR-1140 VWR-1140
VWR-24017
VWR-25588
Zipherius Turas Zipherius Turas
VWR-76 VWR-76
VWR-77 VWR-77
......
indra/llrender/llfontgl.cpp
+ 3
− 0
View file @ 91ac6b16
...@@ -189,6 +189,9 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons ...@@ -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[VX] -= llround((F32)sCurOrigin.mX) - (sCurOrigin.mX);
origin.mV[VY] -= llround((F32)sCurOrigin.mY) - (sCurOrigin.mY); 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 chars_drawn = 0;
S32 i; S32 i;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment