From 53bc4d4f42c9928f8eef290e8f4f98daaec651ac Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 2 Jun 2010 02:34:29 -0700 Subject: Applied patch for #315 (mRawImage.notNull() crash) by Robin Cornelius --- linden/indra/newview/lldrawpoolbump.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index ff464f7..fb7a213 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp @@ -583,6 +583,11 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params, S32 channel) case BE_DARKNESS: if( tex ) { + if(tex->getID()== IMG_DEFAULT) + { + return TRUE; + } + bump = gBumpImageList.getBrightnessDarknessImage( tex, bump_code ); } break; -- cgit v1.1