diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-07-12 17:54:02 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-07-12 17:54:02 +0100 |
| commit | efb72e66d0e091121e9e616125b3162fb69e97b5 (patch) | |
| tree | 04f3364a5520f49116a97439d8bb5ba9b1460aa3 /indra/llcharacter | |
| parent | d3f114d6901877bb79ae9719f59d681fa6a9d494 (diff) | |
SNOW-484/DEV-51808 FIXED Recursive animations can crash viewer
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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 //------------------------------------------------------------------------- |