From 5647e745989d6c3e4387ec990a35c4308dd6b929 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 6 Oct 2010 16:56:38 -0700 Subject: added param block support for empty/undefined elements in XML/LLSD respectively. This way or LLSD["foo"]; both define a default constructed value for the parameter named foo, useful in the Multiple case --- indra/llxuixml/llinitparam.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/llxuixml/llinitparam.cpp') diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 2c92539387..7ffcd91879 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -312,6 +312,13 @@ namespace LLInitParam } } + // if no match, and no names left on stack, this is just an existence assertion of this block + // verify by calling readValue with NoValue type, an inherently unparseable type + if (!names_left) + { + return p.readValue(NoValue()); + } + return false; } -- cgit v1.2.3 From a21be75f605822310d819dcb5c35157676b4f740 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 6 Oct 2010 17:07:14 -0700 Subject: Fix for a compile error. Reviwed by Richard. --- indra/llxuixml/llinitparam.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llxuixml/llinitparam.cpp') diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 7ffcd91879..bf2de9360a 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -316,7 +316,8 @@ namespace LLInitParam // verify by calling readValue with NoValue type, an inherently unparseable type if (!names_left) { - return p.readValue(NoValue()); + NoValue no_value; + return p.readValue(no_value); } return false; -- cgit v1.2.3 From 6c0e9432d027dfb363baf4eaff79a835e3e75b37 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 8 Oct 2010 12:18:16 -0700 Subject: potential fix for linux build --- indra/llxuixml/llinitparam.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llxuixml/llinitparam.cpp') diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index bf2de9360a..fcdbaa4309 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -313,10 +313,10 @@ namespace LLInitParam } // if no match, and no names left on stack, this is just an existence assertion of this block - // verify by calling readValue with NoValue type, an inherently unparseable type + // verify by calling readValue with NoParamValue type, an inherently unparseable type if (!names_left) { - NoValue no_value; + NoParamValue no_value; return p.readValue(no_value); } -- cgit v1.2.3