summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdutil.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-02-14 10:56:31 -0800
committercallum_linden <none@none>2018-02-14 10:56:31 -0800
commit08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch)
treecaa4327b04a438978fd9bae207ea86269f1525b6 /indra/llcommon/llsdutil.cpp
parentb2eb85df79f317d2b587c969178cea9b96c81213 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
-rw-r--r--indra/llcommon/llsdutil.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 6ad4a97149..9d00395c0a 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -193,6 +193,14 @@ char* ll_pretty_print_sd(const LLSD& sd)
return buffer;
}
+std::string ll_stream_notation_sd(const LLSD& sd)
+{
+ std::ostringstream stream;
+ stream << LLSDOStreamer<LLSDNotationFormatter>(sd);
+ return stream.str();
+}
+
+
//compares the structure of an LLSD to a template LLSD and stores the
//"valid" values in a 3rd LLSD. Default values pulled from the template
//if the tested LLSD does not contain the key/value pair.