diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-25 16:06:34 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-25 16:06:34 -0400 |
| commit | 1b56e796241f0efbcbe6a3f95d373220b6b54fad (patch) | |
| tree | 6b6b74430317ad820a5ee2172a4b0a7c36089dac /indra/llxuixml | |
| parent | 35fb83e1e3cc6c05b2319fd5b04897007c7923a2 (diff) | |
| parent | 8da5677f8a233ed7769b6414ed5223d75512d887 (diff) | |
automated 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 582f5449d9..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(BaseBlock::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; |