Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add crash fix by day oh and fix hex editor

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-03 11:01:47 -03:00
parent 3e4dd65ad8
commit a8e7d3f3d9
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcharacter/llkeyframemotion.cpp
View File

@@ -658,7 +658,15 @@ BOOL LLKeyframeMotion::onActivate()
// If the keyframe anim has an associated emote, trigger it.
if( mJointMotionList->mEmoteName.length() > 0 )
{
mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
// <edit> crashfix
//mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
LLUUID emo = gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName);
if(mCharacter->findMotion(emo) == NULL)
{
mCharacter->startMotion(emo);
}
// </edit>
}
mLastLoopedTime = 0.f;