From fd98fbf0a5356bd71fddf49e59283fe7fc1b5007 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Thu, 10 Feb 2022 10:31:48 +0100
Subject: [PATCH] Disable "-Wmismatched-new-delete", certainly needs another
 set of eyes to glance over this, but it appears hidden under a layer of
 templates, operators and inheritance the right thing happens: new >
 posix_memalign / delete -> free. According to the man pages this would be
 correct.

---
 indra/newview/lldrawable.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index d7ebf28354..685e133ea3 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -54,6 +54,13 @@
 #include "llcontrolavatar.h"
 #include "lldrawpoolavatar.h"
 
+// <FS:ND> Tentatively ignoring mismatched new/delete from the MemTrackableNonVirtual. I think according to the docs
+// they are properly matched
+#if LL_LINUX
+#pragma GCC diagnostic ignored "-Wmismatched-new-delete"
+#endif
+// </FS:ND>
+
 const F32 MIN_INTERPOLATE_DISTANCE_SQUARED = 0.001f * 0.001f;
 const F32 MAX_INTERPOLATE_DISTANCE_SQUARED = 10.f * 10.f;
 const F32 OBJECT_DAMPING_TIME_CONSTANT = 0.06f;