diff options
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
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)); } |