diff options
| author | Richard Linden <none@none> | 2012-11-02 20:03:44 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-02 20:03:44 -0700 |
| commit | f8eaee753174d0cab4e4edcf795f422706d6f302 (patch) | |
| tree | 7f16a502c6a8c4df57dfa74303a04d66eed74fa7 /indra/llcommon/llsdparam.cpp | |
| parent | bb6bda9eef48f5b08b56af46321b79fe7f1d49d7 (diff) | |
SH-3499 Ensure asset stats output is correct
improvements to predicate API
default rules encapsulated in LLInitParam
removed empty flag from viewer asset stats
Diffstat (limited to 'indra/llcommon/llsdparam.cpp')
| -rw-r--r-- | indra/llcommon/llsdparam.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdparam.cpp b/indra/llcommon/llsdparam.cpp index c10e1b1e20..345e30f4b4 100644 --- a/indra/llcommon/llsdparam.cpp +++ b/indra/llcommon/llsdparam.cpp @@ -102,13 +102,13 @@ void LLParamSDParser::readSD(const LLSD& sd, LLInitParam::BaseBlock& block, bool //readSDValues(sd, block); } -void LLParamSDParser::writeSD(LLSD& sd, const LLInitParam::BaseBlock& block, LLInitParam::predicate_rule_t rules) +void LLParamSDParser::writeSDImpl(LLSD& sd, const LLInitParam::BaseBlock& block, const LLInitParam::predicate_rule_t rules, const LLInitParam::BaseBlock* diff_block) { mNameStack.clear(); mWriteRootSD = &sd; name_stack_t name_stack; - block.serializeBlock(*this, name_stack, rules); + block.serializeBlock(*this, name_stack, rules, diff_block); } /*virtual*/ std::string LLParamSDParser::getCurrentElementName() |