diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-14 17:11:56 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-14 17:11:56 -0600 |
| commit | 0da2ab228961f1e50c830121c37cfa77c431a980 (patch) | |
| tree | 21dcb315293f5ac1c2e60d80669ac8590b095416 /indra/newview/llphysicsmotion.cpp | |
| parent | 6aa4d06cb6b728beac15773e9f08a02e375893ea (diff) | |
| parent | 559b162eec914d8e4f6f9f28a46184c9bcd51921 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/newview/llphysicsmotion.cpp')
| -rw-r--r-- | indra/newview/llphysicsmotion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp index 30ca7ae539..03a02ba26f 100644 --- a/indra/newview/llphysicsmotion.cpp +++ b/indra/newview/llphysicsmotion.cpp @@ -453,7 +453,7 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; // Skip if disabled globally. if (!gSavedSettings.getBOOL("AvatarPhysics")) { |