summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-24 15:15:55 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-24 15:15:55 -0700
commit43bb0349554dc82a47ad109725da66eac843389f (patch)
tree0c84e5e33796a78767e9592cb5b0b39390bfc99d /indra/newview
parent66e53759679910e2c3720cda92ba6e917c66d12c (diff)
NORSPEC-189 throw caution to the wind and avoid using getVolume() check which has deleterious effects on materials rendering
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
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())