diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-13 17:16:36 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-13 17:16:36 -0700 |
| commit | 37fc4e42dd173d92abb31be83dbd04fa3b7b70fa (patch) | |
| tree | 0355075f8fb41548989517abc44a129f73c4a545 /indra/llcharacter | |
| parent | a884f5c0c794777f33012a5ca318fd98bab32667 (diff) | |
| parent | 75c70884dab91490613ee0c9b866346a00bc9ad9 (diff) | |
Merge
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 //------------------------------------------------------------------------- |