diff options
author | Richard Linden <none@none> | 2010-09-16 16:26:45 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-16 16:26:45 -0700 |
commit | c46a82c56b5b47497f3adc94ea2ddfdb1d4aa1cf (patch) | |
tree | 4a8253744f648df73fd7e8e71bb1a7cd02bb804d /indra/llxuixml/llinitparam.cpp | |
parent | 7a3fc995c3af52004fb1efee8c2f1de55fffef04 (diff) |
renamed isProvided() to anyProvided() and fixed partial params (missing mandatory elements) not merging over complete params
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
-rw-r--r-- | indra/llxuixml/llinitparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index dc4d93d38a..2c92539387 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -178,7 +178,7 @@ namespace LLInitParam param_handle_t param_handle = it->second->mParamHandle; const Param* param = getParamFromHandle(param_handle); ParamDescriptor::serialize_func_t serialize_func = it->second->mSerializeFunc; - if (serialize_func && param->getProvided()) + if (serialize_func && param->anyProvided()) { // Ensure this param has not already been serialized // Prevents <rect> from being serialized as its own tag. |