From b089fc559a5dc527ed5e0422e82abf3b1dd5f1b2 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 28 Sep 2007 23:32:53 +0000 Subject: EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release ** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ** ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa --- indra/llimage/llimageworker.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/llimage/llimageworker.cpp') diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 9a200cdf61..75cf24947d 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -79,10 +79,7 @@ bool LLImageWorker::doWork(S32 param) } else { - S32 nc = param ? 1 : mFormattedImage->getComponents(); - mDecodedImage = new LLImageRaw(mFormattedImage->getWidth(), - mFormattedImage->getHeight(), - nc); + mDecodedImage = new LLImageRaw(); // allow possibly smaller size set during decoding } } if (!decoded) -- cgit v1.2.3