From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Jan 2007 19:12:31 +0000 Subject: merge -r 56842:57026 maintenance. --- indra/llimage/llimagej2c.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llimage/llimagej2c.cpp') diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index d4c08ca377..32a8c60fac 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -224,7 +224,7 @@ BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_chann // Update the raw discard level updateRawDiscardLevel(); - return mImpl->decodeImpl(*this, *raw_imagep, decode_time, 0, 4); + return mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count); } -- cgit v1.2.3