diff options
| author | Richard Linden <none@none> | 2012-05-21 17:16:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-05-21 17:16:34 -0700 |
| commit | 723f596bf6f2fac2c24360790024ec3a4e778793 (patch) | |
| tree | 1153ec6b49f00783499af3c1e6af58fe1de86409 /indra/llui/llsdparam.cpp | |
| parent | 32717690ee6a9f33ca909f0df0226e9533f69399 (diff) | |
| parent | 61bc25211be31ad28b8ae342c17b4ea1c32d955c (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llui/llsdparam.cpp')
| -rw-r--r-- | indra/llui/llsdparam.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp index bcfb38aa11..811e20e810 100644 --- a/indra/llui/llsdparam.cpp +++ b/indra/llui/llsdparam.cpp @@ -283,7 +283,10 @@ void LLParamSDParserUtilities::readSDValues(read_sd_cb_t cb, const LLSD& sd, LLI it != sd.endArray(); ++it) { - stack.back().second = true; + if (!stack.empty()) + { + stack.back().second = true; + } readSDValues(cb, *it, stack); } } @@ -336,7 +339,6 @@ namespace LLInitParam void ParamValue<LLSD, NOT_BLOCK>::serializeBlock(Parser& p, Parser::name_stack_t& name_stack, const BaseBlock* diff_block) const { // read from LLSD value and serialize out to parser (which could be LLSD, XUI, etc) - Parser::name_stack_t stack; - LLParamSDParserUtilities::readSDValues(boost::bind(&serializeElement, boost::ref(p), _1, _2), mValue, stack); + LLParamSDParserUtilities::readSDValues(boost::bind(&serializeElement, boost::ref(p), _1, _2), mValue, name_stack); } } |