livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4544 Fix extension check being case sensitive

master
Andrey Kleshchev 2025-08-16 09:27:10 +03:00 committed by Andrey Kleshchev
parent 99001eaa4f
commit 89b8490ded
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloatermodelpreview.cpp
View File

@ -1322,18 +1322,19 @@ void LLFloaterModelPreview::createSmoothComboBox(LLComboBox* combo_box, float mi
} }
} }
std::string get_source_file_extr(const std::string& filename) std::string get_source_file_format(const std::string& filename)
{ {
if (std::string::npos != filename.rfind(".gltf") const std::string extension = gDirUtilp->getExtension(filename);
|| std::string::npos != filename.rfind(".glb")) if (extension == "gltf"
|| extension == "glb")
{ {
return "gltf"; return "gltf";
} }
else if (std::string::npos != filename.rfind(".dae")) else if (extension == "dae")
{ {
return "dae"; return "dae";
} }
else if (std::string::npos != filename.rfind(".slm")) else if (extension == "slm")
{ {
return "slm"; return "slm";
} }
@ -1366,7 +1367,7 @@ void LLFloaterModelPreview::fillLODSourceStatistics(LLFloaterModelPreview::lod_s
else if (mLODMode[lod] == LLModelPreview::LOD_FROM_FILE) else if (mLODMode[lod] == LLModelPreview::LOD_FROM_FILE)
{ {
const std::string& file = mModelPreview->mLODFile[lod]; const std::string& file = mModelPreview->mLODFile[lod];
lod_sources[lod_string] = get_source_file_extr(file); lod_sources[lod_string] = get_source_file_format(file);
} }
else else
{ {
@ -1391,7 +1392,7 @@ void LLFloaterModelPreview::fillLODSourceStatistics(LLFloaterModelPreview::lod_s
{ {
// There is a chance it will misfire if someone tries to upload a cube.dae mesh, // There is a chance it will misfire if someone tries to upload a cube.dae mesh,
// but should be negligible enough. // but should be negligible enough.
lod_sources["physics"] = get_source_file_extr(file); lod_sources["physics"] = get_source_file_format(file);
} }
else else
{ {