diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
| commit | 38208441db5e969112a4b911aa4d063d5a1031f2 (patch) | |
| tree | 84158d6183058b48737ba9b19304bd4ae5f57afa /indra/newview/llvoavatar.cpp | |
| parent | 92b09e3a164e59f5a0c4e436d044590513ddc6bd (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge remote-tracking branch 'origin/master' 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(); + } } //-------------------------------------------------------------------- |