diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-30 13:33:19 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-30 13:33:19 +0300 |
| commit | e64b281dd674d3230d83aba0ab622ea48d2ae594 (patch) | |
| tree | c4ad5f8ba3c7ff6456a04fa9e22e3844074dcb54 /indra/llrender | |
| parent | 7fcca83169287b5011b5b5a0193456e9a789619c (diff) | |
| parent | 33ebc9674926eb0fd5679ae8e41d05d790b03de1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 6a7eba2712..2240a2146c 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -369,7 +369,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons if (right_x) { - *right_x = cur_x / sScaleX; + *right_x = (cur_x - origin.mV[VX]) / sScaleX; } //FIXME: add underline as glyph? |