summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-04 14:27:41 -0800
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-04 14:27:41 -0800
commitf3aa1aa31e75c88ea0b5402dc1948bfd44523419 (patch)
tree21cdca6058eedddcbc5e9bf6cdb340ffaefa2e2b /indra/newview
parent8c5c877d304d1173d2be2e6dcaa8982a4a16c6c0 (diff)
For MAINT-1930 add checks to unprotected volume pointer deref
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 246c84e3cb..db52b1bd1e 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1268,7 +1268,7 @@ BOOL LLVOVolume::calcLOD()
else
{
distance = mDrawable->mDistanceWRTCamera;
- radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
+ radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
}
//hold onto unmodified distance for debugging