result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 57a024ecee..5a0a76b3f3 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -265,3 +265,16 @@ char* ll_print_sd(const LLSD& sd)
 	buffer[bufferSize - 1] = '\0';
 	return buffer;
 }
+
+char* ll_pretty_print_sd(const LLSD& sd)
+{
+	const U32 bufferSize = 10 * 1024;
+	static char buffer[bufferSize];
+	std::ostringstream stream;
+	//stream.rdbuf()->pubsetbuf(buffer, bufferSize);
+	stream << LLSDOStreamer<LLSDXMLFormatter>(sd, LLSDFormatter::OPTIONS_PRETTY);
+	stream << std::ends;
+	strncpy(buffer, stream.str().c_str(), bufferSize);
+	buffer[bufferSize - 1] = '\0';
+	return buffer;
+}
\ No newline at end of file