diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-02-13 19:52:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-13 19:52:12 +0200 |
| commit | 8f8453c3e859750ada26adc29ed52e3f37e013f6 (patch) | |
| tree | 17a692fecb648b9d1a4f2d7e927fc5d2ea3dedc0 /indra/llrender | |
| parent | 0679cbdec89fbd3ec470768bdf469f6a1d326859 (diff) | |
| parent | d74b30b4ec3b1974ee0d781fb34b1c9518b9985d (diff) | |
Merge pull request #3549 from secondlife/marchcat/foreverfps-xcode-16
Update ForeverFPS build to use macos15/xcode16.1
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 1f14d82bf1..38dc23d1dc 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -715,7 +715,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll if (error == FT_Err_Out_Of_Memory) { LLError::LLUserWarningMsg::showOutOfMemory(); - LL_ERRS() << "Out of memory loading glyph for character " << wch << LL_ENDL; + LL_ERRS() << "Out of memory loading glyph for character " << llformat("U+%xu", U32(wch)) << LL_ENDL; } std::string message = llformat( diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 3858811a50..0bfcb5d9d2 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1773,7 +1773,7 @@ void LLImageGL::syncToMainThread(LLGLuint new_tex_name) ref(); LL::WorkQueue::postMaybe( mMainQueue, - [=]() + [=, this]() { LL_PROFILE_ZONE_NAMED("cglt - delete callback"); syncTexName(new_tex_name); |