Merge branch 'main' into DRTVWR-559

2 files changed, 8 insertions, 0 deletions

diff --git a/indra/llmeshoptimizer/CMakeLists.txt b/indra/llmeshoptimizer/CMakeLists.txt
index dfac44c296..1511e75b39 100644
--- a/indra/llmeshoptimizer/CMakeLists.txt
+++ b/indra/llmeshoptimizer/CMakeLists.txt
@@ -30,5 +30,7 @@ target_link_libraries(llmeshoptimizer
         llmath
         ll::meshoptimizer)
 
+include(LibraryInstall)
+
 # Add tests
 
diff --git a/indra/llmeshoptimizer/llmeshoptimizer.cpp b/indra/llmeshoptimizer/llmeshoptimizer.cpp
index c178348968..ce2b9f99b1 100644
--- a/indra/llmeshoptimizer/llmeshoptimizer.cpp
+++ b/indra/llmeshoptimizer/llmeshoptimizer.cpp
@@ -291,6 +291,9 @@ U64 LLMeshOptimizer::simplifyU32(U32 *destination,
             vertex_positions_stride,
             target_index_count,
             target_error,
+#ifdef LL_USESYSTEMLIBS
+            0,
+#endif
             result_error
             );
     }
@@ -332,6 +335,9 @@ U64 LLMeshOptimizer::simplify(U16 *destination,
             vertex_positions_stride,
             target_index_count,
             target_error,
+#ifdef LL_USESYSTEMLIBS
+            0,
+#endif
             result_error
             );
     }