1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 4cb2227..c1e26a1 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1246,6 +1246,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                 return FALSE;
         }
 
+        if(mJointMotionList->mEmoteName==mID.asString())
+        {
+                llwarns << "Malformed animation mEmoteName==mID" << llendl;
+                return FALSE;
+        }
+
         //-------------------------------------------------------------------------
         // get loop
         //-------------------------------------------------------------------------