summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-27 14:22:14 -0700
committerRichard Linden <none@none>2010-07-27 14:22:14 -0700
commit15247f086989a43881d79c1ee5416bb00721eb68 (patch)
treee77d629f6d03ed7ca471e77ccefcd9437be82c49 /indra/llcharacter
parent5d85dad85f07ea23b3a2892276d8ac591a966864 (diff)
Backed out changeset: 58571b4e704b
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llkeyframemotion.cpp6
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
//-------------------------------------------------------------------------