From 46ab23c94be164cb174a97bde11cc38067f9edd0 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 11 Mar 2013 18:02:16 -0400
Subject: llinventory merge fixes

---
 indra/test/llpermissions_tut.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/test/llpermissions_tut.cpp')

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);
 	}
-- 
cgit v1.3