diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
commit | a997e131d4262f0a18a6f4f8c305c73edbfea6b6 (patch) | |
tree | 5b7f8595e7911f4fd7ba6f2824c6b92f8478a9ef /indra/llui/llsdparam.cpp | |
parent | cab31b572d1a3b717b7f8b9fdf2a49f0b2eb6995 (diff) | |
parent | bbf497469c4d71d5308421f1ef06d0a2098772c8 (diff) |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llui/llsdparam.cpp')
-rw-r--r-- | indra/llui/llsdparam.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp index 1b0f3c9885..4bb45a3065 100644 --- a/indra/llui/llsdparam.cpp +++ b/indra/llui/llsdparam.cpp @@ -90,15 +90,7 @@ void LLParamSDParser::readSD(const LLSD& sd, LLInitParam::BaseBlock& block, bool mNameStack.clear(); setParseSilently(silent); - // must have named elements at top level to submit for parsing - if (sd.isMap()) - { - readSDValues(sd, block); - } - else - { - parserWarning("Top level map required for LLSD->Block conversion"); - } + readSDValues(sd, block); } void LLParamSDParser::writeSD(LLSD& sd, const LLInitParam::BaseBlock& block) |