diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 06:26:10 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 06:26:10 +0100 |
| commit | 2a99af8d949b982ea5832735c61ca249554f5b02 (patch) | |
| tree | 32eab019655594da9a89dd033e37b31278b7c65f /indra/llxuixml | |
| parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
Fix linux build from llinitparam problem... probably.
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..582f5449d9 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(BaseBlock::selfBlockDescriptor(), src_typed_param, overwrite || !dst_typed_param.isProvided())) { dst_typed_param.mData.clearKey(); return true; |