Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

1 files changed, 28 insertions, 26 deletions

diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 7a22eaf203..bf8801c46b 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -47,30 +47,13 @@ void* ll_tracy_new(size_t size)
     return ptr;
 }
 
-void* ll_tracy_aligned_new(size_t size, size_t alignment)
-{
-    void* ptr = ll_aligned_malloc_fallback(size, alignment);
-    if (!ptr)
-    {
-        throw std::bad_alloc();
-    }
-    LL_PROFILE_ALLOC(ptr, size);
-    return ptr;
-}
-
 void ll_tracy_delete(void* ptr)
 {
     LL_PROFILE_FREE(ptr);
     (free)(ptr);
 }
 
-void ll_tracy_aligned_delete(void* ptr)
-{
-    LL_PROFILE_FREE(ptr);
-    ll_aligned_free_fallback(ptr);
-}
-
-void* operator new(size_t size)
+void* operator new(std::size_t size)
 {
     return ll_tracy_new(size);
 }
@@ -80,24 +63,41 @@ void* operator new[](std::size_t count)
     return ll_tracy_new(count);
 }
 
-void* operator new(size_t size, std::align_val_t align)
+void operator delete(void *ptr) noexcept
 {
-    return ll_tracy_aligned_new(size, (size_t)align);
+    ll_tracy_delete(ptr);
 }
 
-void* operator new[](std::size_t count, std::align_val_t align)
+void operator delete[](void* ptr) noexcept
 {
-    return ll_tracy_aligned_new(count, (size_t)align);
+    ll_tracy_delete(ptr);
 }
 
-void operator delete(void *ptr) noexcept
+#if !defined(LL_LINUX)
+
+void* ll_tracy_aligned_new(size_t size, size_t alignment)
 {
-    ll_tracy_delete(ptr);
+    void* ptr = ll_aligned_malloc_fallback(size, alignment);
+    if (!ptr)
+    {
+        throw std::bad_alloc();
+    }
+    return ptr;
 }
 
-void operator delete[](void* ptr) noexcept
+void ll_tracy_aligned_delete(void* ptr)
 {
-    ll_tracy_delete(ptr);
+    ll_aligned_free_fallback(ptr);
+}
+
+void* operator new(size_t size, std::align_val_t align)
+{
+    return ll_tracy_aligned_new(size, (size_t)align);
+}
+
+void* operator new[](std::size_t count, std::align_val_t align)
+{
+    return ll_tracy_aligned_new(count, (size_t)align);
 }
 
 void operator delete(void *ptr, std::align_val_t align) noexcept
@@ -110,6 +110,8 @@ void operator delete[](void* ptr, std::align_val_t align) noexcept
     ll_tracy_aligned_delete(ptr);
 }
 
+#endif
+
 #endif // TRACY_ENABLE && !LL_PROFILER_ENABLE_TRACY_OPENGL
 
 //static