diff options
| author | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
| commit | 093e83386d5a132cc8947095f93ea6405aab6e3f (patch) | |
| tree | 043184fa92c8a6a9f8e747eb13056616bb27ba20 /indra/llrender/llfontgl.cpp | |
| parent | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (diff) | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -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 849318ccee..5336fd5c8b 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -399,7 +399,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons gGL.pushUIMatrix(); renderUTF8(std::string("..."), 0, - cur_x / sScaleX, (F32)y, + (cur_x - origin.mV[VX]) / sScaleX, (F32)y, color, LEFT, valign, style_to_add, |