svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386

QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files

1 files changed, 21 insertions, 9 deletions

diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 350fc5394b..c322522ce3 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -634,7 +634,7 @@ namespace tut
 		ensure_equals("size of buffer", count, total_size);
 		LLBufferStream istr(ch, &mBuffer);
 		LLSD data;
-		count = LLSDSerialize::fromNotation(data, istr);
+		count = LLSDSerialize::fromNotation(data, istr, total_size);
 		ensure("sd parsed", data.isDefined());
 
 		for(S32 j = 0; j < 3; ++j)
@@ -699,7 +699,7 @@ namespace tut
 		ensure_equals("size of buffer", count, total_size);
 		LLBufferStream istr(ch, &mBuffer);
 		LLSD data;
-		count = LLSDSerialize::fromNotation(data, istr);
+		count = LLSDSerialize::fromNotation(data, istr, total_size);
 		ensure("sd parsed", data.isDefined());
 	}
 
@@ -735,7 +735,10 @@ namespace tut
 		ch = mBuffer.nextChannel();
 		LLBufferStream istr(ch, &mBuffer);
 		LLSD data;
-		S32 count = LLSDSerialize::fromNotation(data, istr);
+		S32 count = LLSDSerialize::fromNotation(
+			data,
+			istr,
+			mBuffer.count(ch.in()));
 		ensure("parsed something", (count > 0));
 		ensure("sd parsed", data.isDefined());
 		ensure_equals("sd type", data.type(), LLSD::TypeMap);
@@ -780,7 +783,7 @@ namespace tut
 		std::istringstream istr;
 		istr.str(val);
 		LLSD sd;
-		S32 count = LLSDSerialize::fromNotation(sd, istr);
+		S32 count = LLSDSerialize::fromNotation(sd, istr, val.size());
 		ensure_equals("parser error return value", count, -1);
 		ensure("data undefined", sd.isUndefined());
 	}
@@ -792,7 +795,7 @@ namespace tut
 		std::istringstream istr;
 		istr.str(val);
 		LLSD sd;
-		S32 count = LLSDSerialize::fromNotation(sd, istr);
+		S32 count = LLSDSerialize::fromNotation(sd, istr, val.size());
 		ensure_equals("parser error return value", count, -1);
 		ensure("data undefined", sd.isUndefined());
 	}
@@ -1324,7 +1327,10 @@ namespace tut
 				  << "}]";
 
 		LLSD request;
-		S32 count = LLSDSerialize::fromNotation(request, stream);
+		S32 count = LLSDSerialize::fromNotation(
+			request,
+			stream,
+			stream.str().size());
 		ensure("parsed something", (count > 0));
 
 		pump_loop(request);
@@ -1425,7 +1431,10 @@ namespace tut
 		LLChannelDescriptors read_channel = buffer.nextChannel();
 		LLBufferStream read_stream(read_channel, &buffer);
 		LLSD request;
-		S32 count = LLSDSerialize::fromNotation(request, read_stream);
+		S32 count = LLSDSerialize::fromNotation(
+			request,
+			read_stream,
+			buffer.count(read_channel.in()));
 		ensure("parsed something", (count > 0));
 		ensure("deserialized", request.isDefined());
 
@@ -1487,7 +1496,10 @@ namespace tut
 		str << "{'message':'" << LLSDNotationFormatter::escapeString(message)
 			<< "'}";
 		LLSD request;
-		S32 count = LLSDSerialize::fromNotation(request, str);
+		S32 count = LLSDSerialize::fromNotation(
+			request,
+			str,
+			str.str().size());
 		ensure_equals("parse count", count, 2);
 		ensure_equals("request type", request.type(), LLSD::TypeMap);
 		pump_loop(request);
@@ -1510,7 +1522,7 @@ namespace tut
 		std::istringstream istr;
 		istr.str(val);
 		LLSD sd;
-		LLSDSerialize::fromNotation(sd, istr);
+		LLSDSerialize::fromNotation(sd, istr, val.size());
 		pump_loop(sd);
 		ensure("valid response", mResponse.isDefined());
 		ensure_equals("parsed type", mResponse.type(), LLSD::TypeMap);