diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
| commit | 85f54aca0f9c93b60e89e79b70bdb1d88b3bc5d6 (patch) | |
| tree | e605c21a938a5ba794df6e43607de8c4a0d81008 /indra/llcharacter | |
| parent | 88782e75462ac3a959a59be97ff50b5fc34aabb9 (diff) | |
| parent | d05353fc3997f29bcf55a2fa49936e690b0725de (diff) | |
automated merge
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 5a2e3f73f9..f4dc3b927b 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -658,7 +658,12 @@ BOOL LLKeyframeMotion::onActivate() // If the keyframe anim has an associated emote, trigger it. if( mJointMotionList->mEmoteName.length() > 0 ) { - mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) ); + LLUUID emote_anim_id = gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName); + // don't start emote if already active to avoid recursion + if (!mCharacter->isMotionActive(emote_anim_id)) + { + mCharacter->startMotion( emote_anim_id ); + } } mLastLoopedTime = 0.f; |