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" +// 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 +// + 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;