diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
| commit | 8007b43876831a0d88833bdc8fd7eb6d543dd38b (patch) | |
| tree | c5c34cbb5c9a9c7bd915b331abb17ab914e3f53a /indra/newview/llvoavatar.cpp | |
| parent | d048795fce3ab83989cb909fde02014f1442cc84 (diff) | |
| parent | aca495c8812d49a5fde80ecefbf3f609b4042bf9 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -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 4ec5c999ac..e55ee21414 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4621,7 +4621,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(); + } } //-------------------------------------------------------------------- |