diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
| commit | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (patch) | |
| tree | a8525988388de004be72251c0d7783a61d314888 /indra/test/llpermissions_tut.cpp | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
| parent | b40fad02de170b5da179cacc22f32f5f25ffd7cb (diff) | |
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
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<> |