diff options
| author | Richard Linden <none@none> | 2010-05-25 14:48:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-05-25 14:48:09 -0700 |
| commit | b0bdde3ee307e144d9047521fce84c318b0fc789 (patch) | |
| tree | 226860f78d30bd438a0b9fca2a9f94013c643188 /indra/llxuixml | |
| parent | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (diff) | |
| parent | 208d935e8f22b03178648dec4bc579a3468232f9 (diff) | |
merge
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 3bddd50659..b645c4be7c 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -858,7 +858,7 @@ namespace LLInitParam { const self_t& src_typed_param = static_cast<const self_t&>(src); self_t& dst_typed_param = static_cast<self_t&>(dst); - if (dst_typed_param.T::merge(selfBlockDescriptor(), src_typed_param, overwrite || !dst_typed_param.isProvided())) + if (dst_typed_param.T::merge(T::selfBlockDescriptor(), src_typed_param, overwrite || !dst_typed_param.isProvided())) { dst_typed_param.mData.clearKey(); return true; |