diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-27 18:20:52 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-27 18:20:52 -0400 |
| commit | ec3f8f4a67bb1a47e634d05ba29ddc6c7bed38b8 (patch) | |
| tree | 548dc379c8f3dad4997ee89035064772b9c14c8b /indra/test/llpermissions_tut.cpp | |
| parent | 878eb2b61a26eef3151319cffd1d8d5196b118c2 (diff) | |
| parent | 3db6e3d9ec6c0b5a4cc9e825ee0c70eaa1461c98 (diff) | |
merge
Diffstat (limited to 'indra/test/llpermissions_tut.cpp')
| -rw-r--r-- | indra/test/llpermissions_tut.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index bf6766424c..dff8bca53f 100644 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -407,7 +407,7 @@ namespace tut LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { - llerrs << "file coudnt be opened\n" << llendl; + llerrs << "file couldn't be opened\n" << llendl; return; } LLPermissions perm,perm1; @@ -425,15 +425,15 @@ namespace tut perm.initMasks(base, ownerp, everyone, groupp, next); - perm.exportFile(fp); + ensure("Permissions export failed", perm.exportFile(fp)); fclose(fp); fp = LLFile::fopen("linden_file.dat","r+"); if(!fp) { - llerrs << "file coudnt be opened\n" << llendl; + llerrs << "file couldn't be opened\n" << llendl; return; } - perm1.importFile(fp); + ensure("Permissions import failed", perm1.importFile(fp)); fclose(fp); ensure_equals("exportFile()/importFile():failed to export and import the data ", perm1, perm); } @@ -457,11 +457,11 @@ namespace tut perm.initMasks(base, ownerp, everyone, groupp, next); std::ostringstream ostream; - perm.exportLegacyStream(ostream); + perm.exportStream(ostream); std::istringstream istream(ostream.str()); - perm1.importLegacyStream(istream); + perm1.importStream(istream); - ensure_equals("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1, perm); + ensure_equals("exportStream()/importStream():failed to export and import the data ", perm1, perm); } template<> template<> |