From e309a58b628b4ded0ca0f522aa653187150e387d Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 11 Jul 2025 21:19:59 +0200 Subject: [PATCH] FIRE-35685: Exporting/importing access lists fails if path contains non-ASCII characters --- indra/newview/llfloaterland.cpp | 4 ++-- indra/newview/llfloaterregioninfo.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 483a861f3b..3b3af4eb35 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3326,7 +3326,7 @@ void LLPanelLandAccess::exportListCallback(LLNameListCtrl* list, const std::vect } std::string filename = filenames[0]; - std::ofstream file(filename.c_str()); + llofstream file(filename.c_str()); if (!file.is_open()) { LLNotificationsUtil::add("ExportFailed"); @@ -3383,7 +3383,7 @@ void LLPanelLandAccess::importListCallback(LLNameListCtrl* list, const std::vect std::string filename = filenames[0]; - std::ifstream file(filename.c_str()); + llifstream file(filename.c_str()); if (!file.is_open()) { return; diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 85047b43f2..8cb8a9f40a 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -4678,7 +4678,7 @@ void LLPanelEstateAccess::exportListCallback(LLNameListCtrl* list, const std::ve } std::string filename = filenames[0]; - std::ofstream file(filename.c_str()); + llofstream file(filename.c_str()); if (!file.is_open()) { LLNotificationsUtil::add("ExportFailed"); @@ -4761,7 +4761,7 @@ void LLPanelEstateAccess::importListCallback(LLNameListCtrl* list, const std::ve std::string filename = filenames[0]; - std::ifstream file(filename.c_str()); + llifstream file(filename.c_str()); if (!file.is_open()) { return;