summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorChristian Goetze (CG) <cg@lindenlab.com>2010-07-22 13:29:05 -0700
committerChristian Goetze (CG) <cg@lindenlab.com>2010-07-22 13:29:05 -0700
commitfe8a5a007ab82f3d6a763c5cb133e1299d238632 (patch)
tree7a0787f0cb5a70890b878e999521ff4522fd75b4 /indra/llcharacter
parent4339600d43601f07d01c676cce5da17c2758c4cb (diff)
parent9838884d908ad0c910251c64c7cb3c761ac11f70 (diff)
merged from "viewer-hotfix"
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llkeyframemotion.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 7bc9e97eb1..f4dc3b927b 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1248,12 +1248,6 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
return FALSE;
}
- if(mJointMotionList->mEmoteName==mID.asString())
- {
- llwarns << "Malformed animation mEmoteName==mID" << llendl;
- return FALSE;
- }
-
//-------------------------------------------------------------------------
// get loop
//-------------------------------------------------------------------------