Merged in DRTVWR-541 (pull request #717)

Push autobuild updates made in DRTVWR-541 into -546

2 files changed, 13 insertions, 6 deletions

diff --git a/build.sh b/build.sh
index 96bcff0e8e..3291039856 100755
--- a/build.sh
+++ b/build.sh
@@ -132,7 +132,11 @@ pre_build()
     fi
     set -x
 
-    "$autobuild" configure --quiet -c $variant -- \
+    # honor autobuild_configure_parameters same as sling-buildscripts
+    eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters))
+
+    "$autobuild" configure --quiet -c $variant \
+     ${eval_autobuild_configure_parameters:---} \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
@@ -182,7 +186,11 @@ build()
   if $build_viewer
   then
     begin_section "autobuild $variant"
-    "$autobuild" build --no-configure -c $variant || fatal "failed building $variant"
+    # honor autobuild_build_parameters same as sling-buildscripts
+    eval_autobuild_build_parameters=$(eval $(echo echo $autobuild_build_parameters))
+    "$autobuild" build --no-configure -c $variant \
+         $eval_autobuild_build_parameters \
+    || fatal "failed building $variant"
     echo true >"$build_dir"/build_ok
     end_section "autobuild $variant"
     
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index da61e7539a..5d4a623bf6 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -34,14 +34,13 @@
 #include "llcleanup.h"
 
 #if (TRACY_ENABLE)
-// Override new/delet for tracy memory profiling
+// Override new/delete for tracy memory profiling
 void *operator new(size_t size)
 {
     auto ptr = (malloc) (size);
     if (!ptr)
     {
         throw std::bad_alloc();
-        return nullptr;
     }
     TracyAlloc(ptr, size);
     return ptr;
@@ -62,7 +61,7 @@ void operator delete(void *ptr) noexcept
 
 void *tracy_aligned_malloc(size_t size, size_t alignment)
 {
-    auto ptr = (_aligned_malloc) (size, alignment);
+    auto ptr = ll_aligned_malloc_fallback(size, alignment);
     if (ptr) TracyAlloc(ptr, size);
     return ptr;
 }
@@ -70,7 +69,7 @@ void *tracy_aligned_malloc(size_t size, size_t alignment)
 void tracy_aligned_free(void *memblock)
 {
     TracyFree(memblock);
-    (_aligned_free)(memblock);
+    ll_aligned_free_fallback(memblock);
 }
 
 #endif