From efb72e66d0e091121e9e616125b3162fb69e97b5 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Mon, 12 Jul 2010 17:54:02 +0100 Subject: SNOW-484/DEV-51808 FIXED Recursive animations can crash viewer --- indra/llcharacter/llkeyframemotion.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index f4dc3b927b..7bc9e97eb1 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -1248,6 +1248,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) return FALSE; } + if(mJointMotionList->mEmoteName==mID.asString()) + { + llwarns << "Malformed animation mEmoteName==mID" << llendl; + return FALSE; + } + //------------------------------------------------------------------------- // get loop //------------------------------------------------------------------------- -- cgit v1.2.3