From 2a99af8d949b982ea5832735c61ca249554f5b02 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 25 May 2010 06:26:10 +0100 Subject: Fix linux build from llinitparam problem... probably. --- indra/llxuixml/llinitparam.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(src); self_t& dst_typed_param = static_cast(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; -- cgit v1.2.3