summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorRider Linden <none@none>2015-04-13 09:37:09 -0700
committerRider Linden <none@none>2015-04-13 09:37:09 -0700
commitfe8dec32dbdd6085dd582c49134551638561ca0e (patch)
tree8adf11b88185879911fca64825e73b95ff9db972 /indra/llappearance
parent2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff)
parent5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff)
Merge
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-xindra/llappearance/llwearable.cpp4
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);
}