diff options
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 9db67a15c8..0f17fb61da 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -732,7 +732,7 @@ namespace LLInitParam // then try to serialize value directly else if (!diff_param || !ParamCompare<T>::equals(typed_param.getValue(), static_cast<const self_t*>(diff_param)->getValue())) { - if (!parser.writeValue(typed_param.getValue(), name_stack)) + if (!parser.writeValue(typed_param.getValue(), name_stack)) { std::string calculated_key = typed_param.calcValueName(typed_param.getValue()); if (!diff_param || !ParamCompare<std::string>::equals(static_cast<const self_t*>(diff_param)->getValueName(), calculated_key)) @@ -1025,11 +1025,11 @@ namespace LLInitParam { std::string calculated_key = typed_param.calcValueName(typed_param.getValue()); if (!parser.writeValue(calculated_key, name_stack)) - { - break; - } + { + break; } } + } else { if(!parser.writeValue(key, name_stack)) @@ -1690,7 +1690,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; } |