diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-05-25 16:07:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-05-25 16:07:15 -0700 |
| commit | d7911eda9ceec64e175c83605915b4229ed515c5 (patch) | |
| tree | 8f4c04528acaeea92450e88d28a64c13d7395c44 /indra/llxuixml | |
| parent | 4bd0291dffdb4f17f70705f7465ccbdbf6da8a93 (diff) | |
| parent | cef5b2c5a470066b873357dedb8d13e88d2379a5 (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 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; |