Fix linux build from llinitparam problem... probably.

meow-7.2.2
Tofu Linden 2010-05-25 06:26:10 +01:00
parent a146a0f27b
commit 2a99af8d94
1 changed files with 1 additions and 1 deletions

View File

@ -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;