From 55f597e2ec363b5cb22fa8f7f5694f7ef6a17772 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 13 Oct 2023 09:56:28 -0700
Subject: DRTVWR-592: Allow using RGBA textures for terrain, as the texture
 uploader does not consolidate opaque textures

---
 indra/llimage/llimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llimage/llimage.cpp')

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() )
-- 
cgit v1.2.3