summaryrefslogtreecommitdiff
path: root/indra/newview/gltf
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/gltf')
-rw-r--r--indra/newview/gltf/asset.cpp2
-rw-r--r--indra/newview/gltf/primitive.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index c210b9c61d..a399a59f40 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -904,7 +904,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 81caff8ab2..5de45119fc 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;