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

#4660 Unable to upload GLTF+bin with spaces in the name

master
Andrey Kleshchev 2025-09-11 22:32:03 +03:00
parent c3c45e00ab
commit ac2cbdcc02
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/gltf/accessor.cpp
View File

@ -158,6 +158,11 @@ bool Buffer::prep(Asset& asset)
{ {
std::string dir = gDirUtilp->getDirName(asset.mFilename); std::string dir = gDirUtilp->getDirName(asset.mFilename);
std::string bin_file = dir + gDirUtilp->getDirDelimiter() + mUri; std::string bin_file = dir + gDirUtilp->getDirDelimiter() + mUri;
if (!gDirUtilp->fileExists(bin_file))
{
// Characters might be escaped in the URI
bin_file = dir + gDirUtilp->getDirDelimiter() + LLURI::unescape(mUri);
}
llifstream file(bin_file.c_str(), std::ios::binary); llifstream file(bin_file.c_str(), std::ios::binary);
if (!file.is_open()) if (!file.is_open())

8
indra/newview/gltf/llgltfloader.cpp
View File

@ -652,6 +652,14 @@ std::string LLGLTFLoader::processTexture(S32 texture_index, const std::string& t
filename = filename.substr(pos + 1); filename = filename.substr(pos + 1);
} }
std::string dir = gDirUtilp->getDirName(mFilename);
std::string full_path = dir + gDirUtilp->getDirDelimiter() + filename;
if (!gDirUtilp->fileExists(full_path) && filename.find("data:") == std::string::npos)
{
// Uri might be escaped
filename = LLURI::unescape(filename);
}
LL_INFOS("GLTF_IMPORT") << "Found texture: " << filename << " for material: " << material_name << LL_ENDL; LL_INFOS("GLTF_IMPORT") << "Found texture: " << filename << " for material: " << material_name << LL_ENDL;
LLSD args; LLSD args;