livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

master
Ansariel 2019-10-18 18:16:50 +02:00
parent 24231e7a71 0bbccb1cda
commit 5bd5d08af7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llvoavatar.cpp
View File

@ -6454,6 +6454,11 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
else
{
gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_START);
// since we did an override, there is no need to do anything else,
// specifically not the startMotion() part at the bottom of this function
// See FIRE-29020
return true;
}
}
else
@ -6495,6 +6500,11 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
else
{
gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_STOP);
// since we did an override, there is no need to do anything else,
// specifically not the stopMotion() part at the bottom of this function
// See FIRE-29020
return true;
}
}
else