From 710d2a6db367e0bc57b098f8ceced68b533674de Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Tue, 15 Dec 2009 14:44:41 -0800 Subject: Fixed an edge case that was triggering an error check when doing HTTP texture fetches. --- indra/newview/lltexturefetch.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 85259fdc1e..9f69ed3964 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -887,6 +887,8 @@ bool LLTextureFetchWorker::doWork(S32 param) } else { + // mFormattedImage gauranteed to not be NULL since cur_size != 0 + mLoadedDiscard = mFormattedImage->getDiscardLevel(); mState = DECODE_IMAGE; return false; // use what we have } -- cgit v1.2.3 From a81a2f19b21134fb52df1e1a735988a04aa0688a Mon Sep 17 00:00:00 2001 From: Runitai <> Date: Tue, 15 Dec 2009 16:47:48 -0600 Subject: EXT-3488 Fix for sky not being reflected in water any more. --- indra/newview/pipeline.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 282eddf380..73b5222ee3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7268,13 +7268,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) updateCull(camera, ref_result, 1); stateSort(camera, ref_result); } - else - { - gGL.setColorMask(true, true); - mWaterRef.clear(); - gGL.setColorMask(true, false); - } - + ref_mask = mRenderTypeMask; mRenderTypeMask = mask; } -- cgit v1.2.3