diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-07-07 22:59:34 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-07-07 22:59:49 +0300 |
| commit | b6e8596cd93268f0c7139cb1efa5919bf989463a (patch) | |
| tree | 79b3dd8c5be906efde8d22fabbf5b08ef364a68c | |
| parent | e292bf2633e4f79a7b600d3bae10cf180c1f20ca (diff) | |
SL-16598 Stuck in Ground Sit
'Sitting' motion was in a loading state, but not active, which resulted in viewer dropping 'sitting' state
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 314c22eb6c..5c76f7b392 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4619,7 +4619,12 @@ bool LLVOAvatar::updateCharacter(LLAgent &agent) } else if (!getParent() && isSitting() && !isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED)) { - getOffObject(); + // If we are starting up, motion might be loading + LLMotion *motionp = mMotionController.findMotion(ANIM_AGENT_SIT_GROUND_CONSTRAINED); + if (!motionp || !mMotionController.isMotionLoading(motionp)) + { + getOffObject(); + } } //-------------------------------------------------------------------- |