diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-05-05 17:38:01 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-05-05 17:38:01 +0300 |
commit | 0faa19e03d27c9acc8b4612d4ee14a343e9240c7 (patch) | |
tree | 5698ec1990efbf83aa67de08de9c370cb25e0369 | |
parent | 5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (diff) |
Linux build fix
-rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 2 | ||||
-rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 91198507c6..81d92d151b 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -307,7 +307,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) S32 file_size = (S32) stat.st_size; - llifstream ifstream(filename, std::ifstream::in | std::ifstream::binary); + llifstream ifstream(filename.c_str(), std::ifstream::in | std::ifstream::binary); LLSD data; LLSDSerialize::fromBinary(data, ifstream, file_size); ifstream.close(); diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index eacc8d87e3..f27da87636 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1670,7 +1670,7 @@ void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinw data["instance"][i] = instance.asLLSD(); } - llofstream out(filename, std::ios_base::out | std::ios_base::binary); + llofstream out(filename.c_str(), std::ios_base::out | std::ios_base::binary); LLSDSerialize::toBinary(data, out); out.flush(); out.close(); |