diff options
| author | Richard Linden <none@none> | 2012-10-22 22:51:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-22 22:51:28 -0700 |
| commit | ae3e4fee377d5a2c319e46e80a80f11b61ffa57f (patch) | |
| tree | f3fa8bbdf6f2b5158ca75813e694e64bc436d23b /indra/llcommon/llsdparam.cpp | |
| parent | d6634fcd2433e18eea1a9bf31da6d7e531817d77 (diff) | |
| parent | 50ad343366f5e18ced40e24e2a1cc2399411c7e5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llcommon/llsdparam.cpp')
| -rw-r--r-- | indra/llcommon/llsdparam.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llsdparam.cpp b/indra/llcommon/llsdparam.cpp index 713f5ac605..42ecc9897d 100644 --- a/indra/llcommon/llsdparam.cpp +++ b/indra/llcommon/llsdparam.cpp @@ -329,7 +329,7 @@ namespace LLInitParam p.writeValue<LLSD::String>(sd.asString(), name_stack); } - void ParamValue<LLSD, TypeValues<LLSD>, false>::serializeBlock(Parser& p, Parser::name_stack_t& name_stack, const predicate_rule_t predicate_rule, const BaseBlock* diff_block) const + bool ParamValue<LLSD, TypeValues<LLSD>, false>::serializeBlock(Parser& p, Parser::name_stack_t& name_stack, const predicate_rule_t predicate_rule, const BaseBlock* diff_block) const { // attempt to write LLSD out directly if (!p.writeValue<LLSD>(mValue, name_stack)) @@ -337,5 +337,6 @@ namespace LLInitParam // otherwise read from LLSD value and serialize out to parser (which could be LLSD, XUI, etc) LLParamSDParserUtilities::readSDValues(boost::bind(&serializeElement, boost::ref(p), _1, _2), mValue, name_stack); } + return true; } } |