diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
| commit | 7495af2ecc055a7ed620d5bb4a60e44a4e166513 (patch) | |
| tree | c5afdacdfdad70867c04bbdcadf1940478040262 /indra/llcommon/llcommon.cpp | |
| parent | f8441963fc3dbbb35da220d6ae68447581a0db97 (diff) | |
| parent | 4edeca44da81bdb436c5bd549ed0c65921dde90e (diff) | |
Merged in SL-16606 (pull request #831)
SL-16606
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
| -rw-r--r-- | indra/llcommon/llcommon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index 25a809dad2..d2c4e66160 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -42,7 +42,7 @@ void *operator new(size_t size) void* ptr; if (gProfilerEnabled) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY; ptr = (malloc)(size); } else @@ -62,7 +62,7 @@ void operator delete(void *ptr) noexcept TracyFree(ptr); if (gProfilerEnabled) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY; (free)(ptr); } else |