diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-08-30 20:13:45 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-08-30 20:13:45 +0300 |
| commit | a00165aad438f69062c3f6e4533c1f16bf8ecf3c (patch) | |
| tree | 1fdda06f62cbd8acd0abc8fe46fa878ab16f43b8 /indra | |
| parent | d53ec6c2df414565284c5236c7ff4aee62f9a266 (diff) | |
MAINT-6683 fixed wrapping issues of notecard embedded items
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 0e2946632a..cf0a117567 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -364,12 +364,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons if (right_x) { - F32 cr_x = (cur_x - origin.mV[VX]) / sScaleX; - if (*right_x < cr_x) - { - // rightmost edge of previously drawn text, don't draw over previous text - *right_x = cr_x; - } + *right_x = (cur_x - origin.mV[VX]) / sScaleX; } //FIXME: add underline as glyph? |