summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagedxt.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2025-08-22 17:12:03 -0700
committerCallum Prentice <callum@lindenlab.com>2025-08-22 17:12:03 -0700
commite935a8aebca4ae014b5f6b438612ac5674678fe6 (patch)
tree531498d040a62c01d444fe91eb99afb091c7fff4 /indra/llimage/llimagedxt.cpp
parentbebd1b208e1b342fabf59844851124a91513e83b (diff)
parentcefee59b0e5fff683a50fe61633a9c14493d7145 (diff)
Merge branch 'develop' into callum/viewer-cef-2025-08
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
-rw-r--r--indra/llimage/llimagedxt.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp
index 6b960f9077..c3fd0c5aa8 100644
--- a/indra/llimage/llimagedxt.cpp
+++ b/indra/llimage/llimagedxt.cpp
@@ -329,6 +329,12 @@ bool LLImageDXT::encodeDXT(const LLImageRaw* raw_image, F32 time, bool explicit_
{
llassert_always(raw_image);
+ if (raw_image->isBufferInvalid())
+ {
+ setLastError("Invalid input, no buffer");
+ return false;
+ }
+
S32 ncomponents = raw_image->getComponents();
EFileFormat format;
switch (ncomponents)