2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index a454e68a92..24df41c6b3 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -903,7 +903,7 @@ bool Asset::save(const std::string& filename)
     // save .gltf
     object obj;
     serialize(obj);
-    std::string buffer = boost::json::serialize(obj, {});
+    std::string buffer = boost::json::serialize(obj);
     std::ofstream file(filename, std::ios::binary);
     file.write(buffer.c_str(), buffer.size());
 
diff --git a/indra/newview/gltf/primitive.cpp b/indra/newview/gltf/primitive.cpp
index e1579374d4..7613d81af4 100644
--- a/indra/newview/gltf/primitive.cpp
+++ b/indra/newview/gltf/primitive.cpp
@@ -32,7 +32,11 @@
 
 #include "mikktspace/mikktspace.hh"
 
+#if LL_USESYSTEMLIBS
+#include <meshoptimizer.h>
+#else
 #include "meshoptimizer/meshoptimizer.h"
+#endif
 
 
 using namespace LL::GLTF;