summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-29 12:05:48 -0700
committerRichard Linden <none@none>2010-07-29 12:05:48 -0700
commit5b609171ffcb25bb38dc684c92d9beb958eb314c (patch)
tree3484202f687783210b6af7ebd7acede30d895339 /indra/llrender/llfontgl.cpp
parent27e07e819d54eb2b571e308e083886fbe2771816 (diff)
parente69f0f8a02466ab17a9bd90fd4a6451b37fe7cfa (diff)
merge
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r--indra/llrender/llfontgl.cpp2
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?