diff options
author | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
---|---|---|
committer | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
commit | 43b7fe66db159faaa84d545f97818e7a6f0f6920 (patch) | |
tree | 6581ed36e716f6aa57b01f2861d6812294fb2261 /indra/llappearance | |
parent | 7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
Merged lindenlab/viewer-tools-update into default
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..5ca9f55ac8 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); + llofstream 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); + llifstream ifs(filename.c_str(), std::ios_base::in | std::ios_base::binary); return (! ifs.is_open())? FAILURE : importStream(ifs, avatarp); } |