summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-08-04 21:11:11 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-08-04 21:11:11 +0100
commitf196d8b18dc90d7204061ea6df5ea17eecfd9ccf (patch)
tree56af379ed81ce41dc2f83ac68a034ca31dbd183b /indra/newview
parent72010fba4d07c768b0f5edd5dc56bf89a98a9985 (diff)
SL-731 - bug fix
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 15fc995ecf..403bff5a9e 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1309,7 +1309,10 @@ BOOL LLVOVolume::calcLOD()
{
LLViewerObject* childp = *iter;
LLVOVolume *child_volp = dynamic_cast<LLVOVolume*>(childp);
- total_tris += child_volp->getTriangleCount();
+ if (child_volp)
+ {
+ total_tris += child_volp->getTriangleCount();
+ }
}
setDebugText(llformat("TRIS %d TOTAL %d", getTriangleCount(), total_tris));
}