diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
| commit | 7495af2ecc055a7ed620d5bb4a60e44a4e166513 (patch) | |
| tree | c5afdacdfdad70867c04bbdcadf1940478040262 /indra/llcharacter/llkeyframefallmotion.cpp | |
| parent | f8441963fc3dbbb35da220d6ae68447581a0db97 (diff) | |
| parent | 4edeca44da81bdb436c5bd549ed0c65921dde90e (diff) | |
Merged in SL-16606 (pull request #831)
SL-16606
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'indra/llcharacter/llkeyframefallmotion.cpp')
| -rw-r--r-- | indra/llcharacter/llkeyframefallmotion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp index 9a41ba4d3d..e8bb2bf95d 100644 --- a/indra/llcharacter/llkeyframefallmotion.cpp +++ b/indra/llcharacter/llkeyframefallmotion.cpp @@ -121,7 +121,7 @@ BOOL LLKeyframeFallMotion::onActivate() //----------------------------------------------------------------------------- BOOL LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; BOOL result = LLKeyframeMotion::onUpdate(activeTime, joint_mask); F32 slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f); |