diff options
| author | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
| commit | 9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch) | |
| tree | 1d28248570ac6e48596c787734bc39a891d9752e /indra/llappearance/llpolyskeletaldistortion.cpp | |
| parent | 736efc7b574635d5c86a97a33b456dd79a035777 (diff) | |
| parent | cbe397ad13665c7bc993e10d8fe1e4a876253378 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llappearance/llpolyskeletaldistortion.cpp')
| -rw-r--r-- | indra/llappearance/llpolyskeletaldistortion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp index 68119a8562..b778c15c22 100644 --- a/indra/llappearance/llpolyskeletaldistortion.cpp +++ b/indra/llappearance/llpolyskeletaldistortion.cpp @@ -179,11 +179,11 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info) //----------------------------------------------------------------------------- // apply() //----------------------------------------------------------------------------- -static LLFastTimer::DeclareTimer FTM_POLYSKELETAL_DISTORTION_APPLY("Skeletal Distortion"); +static LLTrace::TimeBlock FTM_POLYSKELETAL_DISTORTION_APPLY("Skeletal Distortion"); void LLPolySkeletalDistortion::apply( ESex avatar_sex ) { - LLFastTimer t(FTM_POLYSKELETAL_DISTORTION_APPLY); + LL_RECORD_BLOCK_TIME(FTM_POLYSKELETAL_DISTORTION_APPLY); F32 effective_weight = ( getSex() & avatar_sex ) ? mCurWeight : getDefaultWeight(); |