From f196d8b18dc90d7204061ea6df5ea17eecfd9ccf Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 4 Aug 2017 21:11:11 +0100
Subject: SL-731 - bug fix

---
 indra/llcharacter/llcharacter.cpp | 2 +-
 indra/newview/llvovolume.cpp      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 4df975ecc5..3e58d9b3cd 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -501,7 +501,7 @@ void LLCharacter::updateVisualParams()
 }
  
 LLAnimPauseRequest LLCharacter::requestPause()
-{
+{X
 	mMotionController.pauseAllMotions();
 	return mPauseRequest;
 }
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));
         }
-- 
cgit v1.2.3