diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:52:16 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:52:16 +0100 |
| commit | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (patch) | |
| tree | aeea23255f4717f57012d5d42075659ecff6c76a /indra/llrender/llfontfreetype.cpp | |
| parent | da0335c864477036ba996fbab4db2194535466d7 (diff) | |
| parent | b2f890408e2dc63a0f842273c41c0efed770cb9a (diff) | |
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer into DRTVWR-489-emoji
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 5535c07615..e4010579b3 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -798,11 +798,11 @@ void LLFontFreetype::setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32 llassert(!mIsFallback); llassert(image_raw && (image_raw->getComponents() == 2)); - U8 *target = image_raw->getData(); + llassert(target); - if (!data) + if (!data || !target) { return; } |