From 2247c3fc6524ef3449cab05a90640092bb072a16 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 13 Oct 2013 22:24:47 +0200
Subject: [PATCH] FIRE-11529; More crash protection to guard against Hugsie
 crashing :)

---
 indra/newview/llemote.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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);
 
+		// <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 )