diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp index 58114adcff..e82171d736 100755 --- a/indra/newview/llemote.cpp +++ b/indra/newview/llemote.cpp @@ -108,6 +108,11 @@ BOOL LLEmote::onUpdate(F32 time, U8* joint_mask) F32 weight = mParam->getMinWeight() + mPose.getWeight() * (mParam->getMaxWeight() - mParam->getMinWeight()); mParam->setWeight(weight, FALSE); + // mCharacter being 0 might be one of the reasons for FIRE-11529 + if( !mCharacter ) + return TRUE; + // + // Cross fade against the default parameter LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); if( default_param )