livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-11529; More crash protection to guard against Hugsie crashing :)

Nicky 2013-10-13 22:24:47 +02:00
parent c32f9976a9
commit 2247c3fc65
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llemote.cpp
View File

@ -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);
// <FS:ND> mCharacter being 0 might be one of the reasons for FIRE-11529
if( !mCharacter )
return TRUE;
// </FS:ND>
// Cross fade against the default parameter
LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );
if( default_param )