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/llcharacter/lleditingmotion.cpp | |
| parent | 61bca72d37f695ee15897ddc3b9215c969ecf648 (diff) | |
| parent | 68b75be652575ff301172b7b19522d4f0494bdf0 (diff) | |
Fix merge conflict
Diffstat (limited to 'indra/llcharacter/lleditingmotion.cpp')
| -rw-r--r-- | indra/llcharacter/lleditingmotion.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp index ddf89f30f2..c5757163d9 100644 --- a/indra/llcharacter/lleditingmotion.cpp +++ b/indra/llcharacter/lleditingmotion.cpp @@ -163,6 +163,7 @@ BOOL LLEditingMotion::onActivate() //----------------------------------------------------------------------------- BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask) { + LL_PROFILE_ZONE_SCOPED; LLVector3 focus_pt; LLVector3* pointAtPt = (LLVector3*)mCharacter->getAnimationData("PointAtPoint"); |