From f6b4cd3b323f0c135adad32de53fded813c56ac6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 25 May 2010 10:23:21 -0700
Subject: [PATCH] fix for llinitparam logic (using wrong scope for static
method)
---
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 582f5449d9d..b645c4be7c8 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;
--
GitLab