diff options
| author | Richard Linden <none@none> | 2011-11-11 11:17:44 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-11 11:17:44 -0800 |
| commit | 267e75d8dc36386070ddb3ecebb31a7bbadd6d03 (patch) | |
| tree | 4a8f0ff2e9796decd346302eee7141d65aca13ca /indra/llxuixml/llinitparam.cpp | |
| parent | 0c9d8d917a4281e2dea7fa2044e86735caca2aa9 (diff) | |
support for assignment of named values to params
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); } } |