From ae464867e6714816cd5bdaeecdd1d3c0a0817e58 Mon Sep 17 00:00:00 2001 From: Jon Wolk Date: Tue, 15 Jul 2008 00:41:08 +0000 Subject: svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 --- indra/llcommon/llsdutil.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llcommon/llsdutil.h') diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h index 7098fa8252..818566fc03 100644 --- a/indra/llcommon/llsdutil.h +++ b/indra/llcommon/llsdutil.h @@ -92,9 +92,11 @@ char* ll_pretty_print_sd(const LLSD& sd); //compares the structure of an LLSD to a template LLSD and stores the //"valid" values in a 3rd LLSD. Default values -//are pulled from the template. Ordering of arrays matters +//are pulled from the template. Extra keys/values in the test +//are ignored in the resultant LLSD. Ordering of arrays matters //Returns false if the test is of same type but values differ in type //Otherwise, returns true + BOOL compare_llsd_with_template( const LLSD& llsd_to_test, const LLSD& template_llsd, -- cgit v1.2.3