diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-27 19:37:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-27 19:37:18 +0300 |
| commit | 0a6f28209e2be86462428a6f779b465e3604e831 (patch) | |
| tree | b968655ced36ef127b028819e9edb509861a76ca /indra/llrender | |
| parent | e008b44fd88be83426812e67707896e970947c49 (diff) | |
| parent | 817bc25b2732dc23295e6a7ac0da5ad142e33434 (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index b9a4235a4e..b6cdb81b33 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -406,7 +406,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons // recursively render ellipses at end of string // we've already reserved enough room gGL.pushUIMatrix(); - renderUTF8(std::string("..."), + static LLWString elipses_wstr(utf8string_to_wstring(std::string("..."))); + render(elipses_wstr, 0, (cur_x - origin.mV[VX]) / sScaleX, (F32)y, color, |