summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-09-29 00:41:47 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-09-29 00:42:03 +0300
commitcd32a40195ea5b42084853c56628746fe84095d3 (patch)
tree1b3cbd3905e4129817c7b2973194c4fef151f435
parentee07a128b16ca824bfede96cb3acd7716900a8e7 (diff)
SL-20366 Crash at setTETextureCore
-rw-r--r--indra/newview/llviewerobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1a02e9ddd0..fa21e36f3e 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4933,7 +4933,7 @@ void LLViewerObject::setTEImage(const U8 te, LLViewerTexture *imagep)
S32 LLViewerObject::setTETextureCore(const U8 te, LLViewerTexture *image)
{
LLUUID old_image_id = getTE(te)->getID();
- const LLUUID& uuid = image->getID();
+ const LLUUID& uuid = image ? image->getID() : LLUUID::null;
S32 retval = 0;
if (uuid != getTE(te)->getID() ||
uuid == LLUUID::null)