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/llxuixml/llinitparam.h | |
| parent | 32717690ee6a9f33ca909f0df0226e9533f69399 (diff) | |
| parent | 61bc25211be31ad28b8ae342c17b4ea1c32d955c (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 29f4a09cb7..435db1699c 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -1024,7 +1024,9 @@ namespace LLInitParam 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)) + if (calculated_key.size() + && (!diff_param + || !ParamCompare<std::string>::equals(static_cast<const self_t*>(diff_param)->getValueName(), calculated_key))) { parser.writeValue(calculated_key, name_stack); } |