diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-01-14 12:22:19 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-01-14 12:22:19 -0800 |
| commit | 4edeca44da81bdb436c5bd549ed0c65921dde90e (patch) | |
| tree | c5afdacdfdad70867c04bbdcadf1940478040262 /indra/newview | |
| parent | a255c6bc727d192be75fbf9b0eb53b0d2a247280 (diff) | |
| parent | cc798a53119d5e504911de25bbf97717a9f4adab (diff) | |
Fix merge conflict
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 60733b73a3..e40fdff751 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2779,7 +2779,7 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled) static void override_bbox(LLDrawable* drawable, LLVector4a* extents) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_SPATIAL; drawable->setSpatialExtents(extents[0], extents[1]); drawable->setPositionGroup(LLVector4a(0, 0, 0)); drawable->movePartition(); |