diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
| commit | 3819c3b049abb0771c7129c0a11a8fcd0725f9fd (patch) | |
| tree | f0bb1432b1ae475c7d844f278b668e1d76193e96 /indra/llxuixml/llinitparam.h | |
| parent | 620b63a31667d93d9186217eb355d05e71ff245c (diff) | |
| parent | 4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff) | |
Merge
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 1e295ada2d..183472450d 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -982,7 +982,7 @@ namespace LLInitParam if (parser.readValue(name)) { // try to parse a per type named value - if (name_value_lookup_t::getValueFromName(name, typed_param.mValues)) + if (name_value_lookup_t::getValueFromName(name, value)) { typed_param.add(value); typed_param.mValues.back().setValueName(name); @@ -1013,7 +1013,7 @@ namespace LLInitParam bool value_written = parser.writeValue(*it, name_stack); if (!value_written) { - std::string calculated_key = typed_param.calcValueName(typed_param.getValue()); + std::string calculated_key = it->calcValueName(key); if (!parser.writeValue(calculated_key, name_stack)) { break; |