summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-08-30 19:57:02 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-08-30 19:57:02 +0300
commitf8254a9d787ab6235c8fb076bd65dc7cd978dce9 (patch)
tree3e4f1b7b3cdbc6b836f5360d015e7e143c8264a1 /indra/newview/llmeshrepository.cpp
parent9d9c04b0448e33b104f6e5b5cb1aea3df63bca9d (diff)
MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rw-r--r--indra/newview/llmeshrepository.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index c2a0393170..b65e7ef352 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1980,14 +1980,14 @@ void dump_llsd_to_file(const LLSD& content, std::string filename)
{
if (gSavedSettings.getBOOL("MeshUploadLogXML"))
{
- std::ofstream of(filename.c_str());
+ llofstream of(filename.c_str());
LLSDSerialize::toPrettyXML(content,of);
}
}
LLSD llsd_from_file(std::string filename)
{
- std::ifstream ifs(filename.c_str());
+ llifstream ifs(filename.c_str());
LLSD result;
LLSDSerialize::fromXML(result,ifs);
return result;