diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
| commit | a70d9363dadd23f5304013f87d47e5251d62c575 (patch) | |
| tree | 774508d959bf46265f1d34dae2ab915c695c16bf /indra/llxuixml/llinitparam.h | |
| parent | b26d3f37bef4e10be2b5f7f4f6408485ed3ccae7 (diff) | |
| parent | 687b4907216339b5ff2b79a5a6c5dfdfb6deeba2 (diff) | |
Merge
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -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; |