diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
| commit | c201038aba861b1166d367fcf5986e33644ec018 (patch) | |
| tree | c9b0379d1936736de93ae3dc2489e54dce96e604 /indra/llcharacter/llkeyframemotion.cpp | |
| parent | b45271834161018be8c825e96c64d9ef7b67401c (diff) | |
| parent | c8602b293517dfb4d5c6658ab235af9fe9932b7e (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.cpp')
| -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 //------------------------------------------------------------------------- |