diff options
| author | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
| commit | 6293746b59a4368d6e95b8c4e0951cd217aeee2b (patch) | |
| tree | 1e7ff05468ed9ed7bb8aef0fc293f495b8dcec9e /indra/llxuixml/llinitparam.cpp | |
| parent | 5a31ac4aee6b41d1b948dc0aa4420cbd5e765ce3 (diff) | |
| parent | 61570bf84fdf5edad1e34188111d551b262c67e8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 482064ed7b..8880072f06 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -478,6 +478,7 @@ namespace LLInitParam if (merge_func) { Param* paramp = getParamFromHandle((*it)->mParamHandle); + llassert(paramp->mEnclosingBlockOffset == (*it)->mParamHandle); some_param_changed |= merge_func(*paramp, *other_paramp, overwrite); } } |