diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-07-13 00:03:11 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-07-13 00:03:11 +0100 |
| commit | ef685e520967f41549519b8df14c7d585f3b644b (patch) | |
| tree | 5116c6538900a94d117c416a08d070f81db6501c | |
| parent | fce7f76cd734a3c9762ada0bfe24d749b5396def (diff) | |
| parent | efb72e66d0e091121e9e616125b3162fb69e97b5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8c6bd5e0fe..c8125c675f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -517,6 +517,7 @@ Ringo Tuxing Robin Cornelius SNOW-108 SNOW-204 + SNOW-484 VWR-2488 VWR-9557 VWR-11128 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 //------------------------------------------------------------------------- |