diff options
| author | Richard Linden <none@none> | 2010-05-25 10:23:21 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-05-25 10:23:21 -0700 |
| commit | f6b4cd3b323f0c135adad32de53fded813c56ac6 (patch) | |
| tree | 5c678827fabbd89686424fa1137b9d57c58362a6 | |
| parent | 1040c7039b9be8e78ff7623a418e14e2b7f2f30a (diff) | |
fix for llinitparam logic (using wrong scope for static method)
| -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; |