diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
| commit | 1be8a8d10bd3542b0b5c2943a508509c5cfcf3ef (patch) | |
| tree | a4bd2bdddb24ae0b443878b0337e77787d3fea40 /indra/llappearance/llpolyskeletaldistortion.cpp | |
| parent | 61bca72d37f695ee15897ddc3b9215c969ecf648 (diff) | |
| parent | 68b75be652575ff301172b7b19522d4f0494bdf0 (diff) | |
Fix merge conflict
Diffstat (limited to 'indra/llappearance/llpolyskeletaldistortion.cpp')
| -rw-r--r-- | indra/llappearance/llpolyskeletaldistortion.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp index ae38c25dbf..360f17508f 100644 --- a/indra/llappearance/llpolyskeletaldistortion.cpp +++ b/indra/llappearance/llpolyskeletaldistortion.cpp @@ -188,11 +188,9 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info) //----------------------------------------------------------------------------- // apply() //----------------------------------------------------------------------------- -static LLTrace::BlockTimerStatHandle FTM_POLYSKELETAL_DISTORTION_APPLY("Skeletal Distortion"); - void LLPolySkeletalDistortion::apply( ESex avatar_sex ) { - LL_RECORD_BLOCK_TIME(FTM_POLYSKELETAL_DISTORTION_APPLY); + LL_PROFILE_ZONE_SCOPED; F32 effective_weight = ( getSex() & avatar_sex ) ? mCurWeight : getDefaultWeight(); |