diff options
| author | Richard Linden <none@none> | 2012-02-03 19:05:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-03 19:05:04 -0800 |
| commit | 8b44dafd8f1641f77572787df5aa8b0cbb5c7aa6 (patch) | |
| tree | 5a6f8aaf5753d0f810dad885bc831935cda4b1b8 /indra/llrender | |
| parent | e0b29b67b6243b84a9c35d3460b91bed5d873d46 (diff) | |
| parent | e854db064547ae20a87bbeac399295a924cf1c8f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 4519c5e789..6e6d02177d 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -185,9 +185,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons //gGL.translateUI(-pixel_offset_x, -pixel_offset_y, 0.f); LLVector2 origin(floorf(sCurOrigin.mX*sScaleX), floorf(sCurOrigin.mY*sScaleY)); - // snap the text origin to a pixel grid to start with - 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. |