diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-10-31 13:08:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-10-31 13:08:40 +0800 |
| commit | 76d31ddf9a4f8bdd94dd86053dd1296912f9c9ac (patch) | |
| tree | ca0842e1c6a8ce85cfb0e0e4094651731f19d8c7 /indra/llrender/llfontgl.cpp | |
| parent | c7714fb31915b70af4ca24cde61751484dd967e9 (diff) | |
| parent | 4b5fa5349e06ce3471875e0c401f9119831ed887 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 94daba0817..4c9a062246 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -404,7 +404,6 @@ 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(); static LLWString elipses_wstr(utf8string_to_wstring(std::string("..."))); render(elipses_wstr, 0, @@ -417,7 +416,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons right_x, false, use_color); - gGL.popUIMatrix(); } gGL.popUIMatrix(); |