diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 20:33:40 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 20:33:40 +0100 |
| commit | b2fc82cb14654b4dbca5a55e66313babf82f77b3 (patch) | |
| tree | 1cbc068c31f936415b909257b9c3341b55eb578b /indra/llrender | |
| parent | d4657fd42bf2d60b068b9b6fd7f758a2094d48d3 (diff) | |
| parent | 5b609171ffcb25bb38dc684c92d9beb958eb314c (diff) | |
merge
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? |