diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-08-05 06:33:21 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-08-05 06:33:21 +0800 |
commit | 689b085fbafd49e8003874f3b318bac55fe248c3 (patch) | |
tree | 7d080c49737e4e8bcf08a3761757b76f67838b86 | |
parent | 096b736998ff2860bb65e64ce63b533752c3c2ed (diff) | |
parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) |
Merge tag 'Second_Life_Release#f338b91f-2025.05' into 2025.052025.05
-rw-r--r-- | indra/newview/gltf/accessor.cpp | 2 | ||||
-rw-r--r-- | indra/newview/gltf/asset.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/gltf/accessor.cpp b/indra/newview/gltf/accessor.cpp index d1845605d4..03f7331893 100644 --- a/indra/newview/gltf/accessor.cpp +++ b/indra/newview/gltf/accessor.cpp @@ -159,7 +159,7 @@ bool Buffer::prep(Asset& asset) std::string dir = gDirUtilp->getDirName(asset.mFilename); std::string bin_file = dir + gDirUtilp->getDirDelimiter() + mUri; - std::ifstream file(bin_file, std::ios::binary); + llifstream file(bin_file.c_str(), std::ios::binary); if (!file.is_open()) { LL_WARNS("GLTF") << "Failed to open file: " << bin_file << LL_ENDL; diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp index f40cc58440..9c394e19d4 100644 --- a/indra/newview/gltf/asset.cpp +++ b/indra/newview/gltf/asset.cpp @@ -696,7 +696,7 @@ bool Asset::load(std::string_view filename, bool loadIntoVRAM) mFilename = filename; std::string ext = gDirUtilp->getExtension(mFilename); - std::ifstream file(filename.data(), std::ios::binary); + llifstream file(filename.data(), std::ios::binary); if (file.is_open()) { std::string str((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>()); |