summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2016-02-07 15:17:57 +0100
committerKitty Barnett <develop@catznip.com>2016-02-07 15:17:57 +0100
commitb8bb07533e4eb62368f673b6de1033bc8c46e6a9 (patch)
treee9db5b4c9c238284d87b90ebd2419fa1c26eaa59 /indra/newview
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
FIXED Crash in LLVOVolume::notifyAboutMissingAsset()
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index b0eb60cc76..25008ccc4f 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2115,6 +2115,8 @@ bool LLVOVolume::notifyAboutMissingAsset(LLViewerTexture *texture)
for(mmap_UUID_MAP_t::iterator range_it = range.first; range_it != range.second; ++range_it)
{
LLMaterialPtr cur_material = getTEMaterialParams(range_it->second.te);
+ if (cur_material.isNull())
+ continue;
switch(range_it->second.map)
{