diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 |
commit | 519cbcecdf78e4dfc3adc465ae8cebed5df71647 (patch) | |
tree | efa8e20856dbfc80e1ae44283cbd0139b828b1b2 /indra/newview/llvoavatar.cpp | |
parent | ada8ad1bc21665631f030c3194a567ea6f6a2a72 (diff) | |
parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) |
Merge with master before reseting to revert (revert) and get back to D519 status
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 414a1da4fe..f69b9b3861 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1140,6 +1140,7 @@ void LLVOAvatar::initInstance() //------------------------------------------------------------------------- if (LLCharacter::sInstances.size() == 1) { + LLKeyframeMotion::setVFS(gStaticVFS); registerMotion( ANIM_AGENT_DO_NOT_DISTURB, LLNullMotion::create ); registerMotion( ANIM_AGENT_CROUCH, LLKeyframeStandMotion::create ); registerMotion( ANIM_AGENT_CROUCHWALK, LLKeyframeWalkMotion::create ); |