From 43bb0349554dc82a47ad109725da66eac843389f Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 24 May 2013 15:15:55 -0700 Subject: NORSPEC-189 throw caution to the wind and avoid using getVolume() check which has deleterious effects on materials rendering --- indra/newview/llvovolume.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7ce0343022..5b69f80dc1 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1976,7 +1976,7 @@ S32 LLVOVolume::setTEGlow(const U8 te, const F32 glow) void LLVOVolume::setTEMaterialParamsCallbackTE(const LLUUID& objectID, const LLMaterialID &pMaterialID, const LLMaterialPtr pMaterialParams, U32 te) { LLVOVolume* pVol = (LLVOVolume*)gObjectList.findObject(objectID); - if (pVol && pVol->getVolume()) + if (pVol) { LL_DEBUGS("MaterialTEs") << "materialid " << pMaterialID.asString() << " to TE " << te << LL_ENDL; if (te >= pVol->getNumTEs()) -- cgit v1.2.3