diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
| commit | 6ce6ce238c68f7a6c99fef2baed9420caf09f848 (patch) | |
| tree | 4291aa0cde0c982028382744fc236180245f23aa /indra/llcharacter | |
| parent | c5356935354013530432cfb07556902a039020a9 (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
automated 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 //------------------------------------------------------------------------- |