summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2015-03-04 19:40:29 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2015-03-04 19:40:29 +0200
commit5eeea87ef4f44baa156c898ae393d5e7edb757de (patch)
tree39f9188f478f4b1fa4c4e0d0310ad91acf396ad7 /indra/newview
parent2eecf882b1cdc63615f3ecd01860d0d5bbdd60b0 (diff)
MAINT-4943 FIXED Crash on location
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 fd2e96744a..47d4e5565b 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2054,7 +2054,7 @@ bool LLVOVolume::notifyAboutCreatingTexture(LLViewerTexture *texture)
LLMaterialPtr cur_material = getTEMaterialParams(range_it->second.te);
//here we just interesting in DIFFUSE_MAP only!
- if(LLRender::DIFFUSE_MAP == range_it->second.map && GL_RGBA != texture->getPrimaryFormat())
+ if(NULL != cur_material.get() && LLRender::DIFFUSE_MAP == range_it->second.map && GL_RGBA != texture->getPrimaryFormat())
{ //ok let's check the diffuse mode
switch(cur_material->getDiffuseAlphaMode())
{