diff options
author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/llappearance | |
parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-x | indra/llappearance/llwearable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 41c06f4368..1bbe878bba 100755 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -88,7 +88,7 @@ LLAssetType::EType LLWearable::getAssetType() const BOOL LLWearable::exportFile(const std::string& filename) const { - llofstream ofs(filename, std::ios_base::out | std::ios_base::trunc | std::ios_base::binary); + std::ofstream ofs(filename.c_str(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary); return ofs.is_open() && exportStream(ofs); } @@ -204,7 +204,7 @@ void LLWearable::createLayers(S32 te, LLAvatarAppearance *avatarp) LLWearable::EImportResult LLWearable::importFile(const std::string& filename, LLAvatarAppearance* avatarp ) { - llifstream ifs(filename, std::ios_base::in | std::ios_base::binary); + std::ifstream ifs(filename.c_str(), std::ios_base::in | std::ios_base::binary); return (! ifs.is_open())? FAILURE : importStream(ifs, avatarp); } |