SL-19353 Mesh importer throws an error when the file extension is upper case

2 files changed, 6 insertions, 2 deletions

diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index fd304f7bc9..7394f99794 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -106,10 +106,12 @@ bool LLGLTFLoader::OpenFile(const std::string &filename)
     tinygltf::TinyGLTF loader;
     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.
-    if (std::string::npos == filename.rfind(".gltf"))
+    if (std::string::npos == filename_lc.rfind(".gltf"))
     {  // file is binary
         mGltfLoaded = loader.LoadBinaryFromFile(&mGltfModel, &error_msg, &warn_msg, filename);
     }
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 56a48cb74d..7ae48eef8c 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -750,7 +750,9 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
 
     // three possible file extensions, .dae .gltf .glb
     // check for .dae and if not then assume one of the .gl??
-    if (std::string::npos != filename.rfind(".dae"))
+    std::string filename_lc(filename);
+    LLStringUtil::toLower(filename_lc);
+    if (std::string::npos != filename_lc.rfind(".dae"))
     {
         mModelLoader = new LLDAELoader(
             filename,