diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 20:01:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 20:01:52 +0100 |
| commit | 9cb26e53f53ca3c2850566deaf91c2b949029898 (patch) | |
| tree | ab427e6392e7e591df99b4f714de49eb52aefadc /indra/llxuixml | |
| parent | 6527e28e595859120973afa32414a7ab7b03ff45 (diff) | |
| parent | 8da5677f8a233ed7769b6414ed5223d75512d887 (diff) | |
merge from viewer-public
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; |