summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2021-10-26 14:07:00 +0000
committerDave Parks <davep@lindenlab.com>2021-10-26 14:07:00 +0000
commit4e8cd9437bed90b3468b1bf12f545de16faefb67 (patch)
tree97456f016e716ad0c9ebd9011299952c12cdeb5f /indra/llcommon
parent081ae57831b40d46acfe8f70e727ab804597ae58 (diff)
SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display).
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llcommon.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index abc6af2cfc..04872564bf 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -44,6 +44,7 @@ void *operator new(size_t size)
{
LL_PROFILE_ZONE_SCOPED;
ptr = (malloc)(size);
+ TracyAlloc(ptr, size);
}
else
{
@@ -53,17 +54,15 @@ void *operator new(size_t size)
{
throw std::bad_alloc();
}
- TracyAlloc(ptr, size);
return ptr;
}
void operator delete(void *ptr) noexcept
{
- TracyFree(ptr);
-
if (gProfilerEnabled)
{
LL_PROFILE_ZONE_SCOPED;
+ TracyFree(ptr);
(free)(ptr);
}
else