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/test | |
| parent | 9ea6a96be9a5fda489d5e5ce28fc2df7c6f4c309 (diff) | |
llinventory merge fixes
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llpermissions_tut.cpp | 4 | ||||
| -rw-r--r-- | indra/test/llsaleinfo_tut.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index dff8bca53f..bc2c87ba46 100644 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -457,9 +457,9 @@ namespace tut perm.initMasks(base, ownerp, everyone, groupp, next); std::ostringstream ostream; - perm.exportStream(ostream); + perm.exportLegacyStream(ostream); std::istringstream istream(ostream.str()); - perm1.importStream(istream); + perm1.importLegacyStream(istream); ensure_equals("exportStream()/importStream():failed to export and import the data ", perm1, perm); } diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp index d546803947..2689eaa15e 100644 --- a/indra/test/llsaleinfo_tut.cpp +++ b/indra/test/llsaleinfo_tut.cpp @@ -146,13 +146,13 @@ namespace tut LLSaleInfo llsaleinfo(LLSaleInfo::FS_ORIGINAL, sale_price); std::ostringstream ostream; - llsaleinfo.exportStream(ostream); + llsaleinfo.exportLegacyStream(ostream); std::istringstream istream(ostream.str()); LLSaleInfo llsaleinfo1; U32 perm_mask = 0; BOOL has_perm_mask = FALSE; - llsaleinfo1.importStream(istream, has_perm_mask, perm_mask); + llsaleinfo1.importLegacyStream(istream, has_perm_mask, perm_mask); ensure("importStream() fn failed ", llsaleinfo.getSalePrice() == llsaleinfo1.getSalePrice() && |