From 7c2111143b14576b0bdeeefddd3a824775fea963 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 21 Dec 2023 18:59:01 -0500
Subject: [PATCH] Fix loading local GLTF materials on case sensitive file
systems
---
indra/newview/lltinygltfhelper.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 5b75db37d08..2fafa6036f0 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -194,26 +194,23 @@ bool LLTinyGLTFHelper::loadModel(const std::string& filename, tinygltf::Model& m
std::string error_msg;
std::string warn_msg;
- std::string filename_lc = filename;
- LLStringUtil::toLower(filename_lc);
-
// Load a tinygltf model fom a file. Assumes that the input filename has already been
// been sanitized to one of (.gltf , .glb) extensions, so does a simple find to distinguish.
bool decode_successful = false;
- if (std::string::npos == filename_lc.rfind(".gltf"))
+ if (exten == "glb")
{ // file is binary
- decode_successful = loader.LoadBinaryFromFile(&model_in, &error_msg, &warn_msg, filename_lc);
+ decode_successful = loader.LoadBinaryFromFile(&model_in, &error_msg, &warn_msg, filename);
}
else
{ // file is ascii
- decode_successful = loader.LoadASCIIFromFile(&model_in, &error_msg, &warn_msg, filename_lc);
+ decode_successful = loader.LoadASCIIFromFile(&model_in, &error_msg, &warn_msg, filename);
}
if (!decode_successful)
{
- LL_WARNS("GLTF") << "Cannot load, error: Failed to decode" << error_msg
- << ", warning:" << warn_msg
- << " file: " << filename
+ LL_WARNS("GLTF") << "Cannot load, error: Failed to decode with error: '" << error_msg
+ << "', warning: '" << warn_msg
+ << "' file: " << filename
<< LL_ENDL;
return false;
}
--
GitLab