diff options
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 9a6ded47ff..71715d15cc 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -1665,7 +1665,7 @@ namespace LLInitParam *static_cast<DERIVED_BLOCK*>(this) = defaultBatchValue(); mLastParseGeneration = -1; // merge individual parameters into destination - return super_t::mergeBlock(super_t::selfBlockDescriptor(), src_typed_param, overwrite); + return super_t::mergeBlock(super_t::selfBlockDescriptor(), other, overwrite); } return false; } @@ -1693,24 +1693,18 @@ namespace LLInitParam typedef const BatchBlock<DERIVED_BLOCK, BASE_BLOCK>& value_assignment_t; ParamValue() - : T(), - mKeyVersion(0), - mValidatedVersion(-1), - mValidated(false) + : BatchBlock<DERIVED_BLOCK, BASE_BLOCK>() {} ParamValue(value_assignment_t other) - : T(other), - mKeyVersion(0), - mValidatedVersion(-1), - mValidated(false) + : BatchBlock<DERIVED_BLOCK, BASE_BLOCK>(other) { } void setValue(value_assignment_t val) { *this = val; - mLastParseGeneration = -1; + BatchBlock<DERIVED_BLOCK, BASE_BLOCK>::mLastParseGeneration = -1; } value_assignment_t getValue() const |