summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-10-13 09:56:28 -0700
committerCosmic Linden <cosmic@lindenlab.com>2023-10-13 09:56:28 -0700
commit55f597e2ec363b5cb22fa8f7f5694f7ef6a17772 (patch)
tree19557aa63bf75d7e18dbbd42c38e988aa31ee1c2 /indra/llimage/llimage.cpp
parenteffb14913b7b5fd7024528ccab5df6fa030e7581 (diff)
DRTVWR-592: Allow using RGBA textures for terrain, as the texture uploader does not consolidate opaque textures
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r--indra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 031471d1fe..a96b6601bd 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1110,7 +1110,7 @@ void LLImageRaw::composite( LLImageRaw* src )
return;
}
- llassert(3 == src->getComponents());
+ llassert((3 == src->getComponents()) || (4 == src->getComponents()));
llassert(3 == dst->getComponents());
if( 3 == dst->getComponents() )