diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 18:02:16 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 18:02:16 -0400 |
| commit | 46ab23c94be164cb174a97bde11cc38067f9edd0 (patch) | |
| tree | e671f5a9c9800a871500532eaba55ce26df5e6ad /indra/llappearance | |
| parent | 9ea6a96be9a5fda489d5e5ce28fc2df7c6f4c309 (diff) | |
llinventory merge fixes
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llwearable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 4028c1dfad..d86a460511 100644 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -81,13 +81,13 @@ BOOL LLWearable::exportStream( std::ostream& output_stream ) const output_stream << mDescription << "\n"; // permissions - if( !mPermissions.exportStream( output_stream ) ) + if( !mPermissions.exportLegacyStream( output_stream ) ) { return FALSE; } // sale info - if( !mSaleInfo.exportStream( output_stream ) ) + if( !mSaleInfo.exportLegacyStream( output_stream ) ) { return FALSE; } @@ -263,7 +263,7 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream, llwarns << "Bad Wearable asset: missing valid permissions" << llendl; return LLWearable::FAILURE; } - if( !mPermissions.importStream( input_stream ) ) + if( !mPermissions.importLegacyStream( input_stream ) ) { return LLWearable::FAILURE; } @@ -288,7 +288,7 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream, // up the vast majority of the tasks. BOOL has_perm_mask = FALSE; U32 perm_mask = 0; - if( !mSaleInfo.importStream(input_stream, has_perm_mask, perm_mask) ) + if( !mSaleInfo.importLegacyStream(input_stream, has_perm_mask, perm_mask) ) { return LLWearable::FAILURE; } |