diff options
| author | Richard Linden <none@none> | 2012-07-27 13:42:10 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-27 13:42:10 -0700 |
| commit | 2da3e2e226cc1c9aaf646dd4e5bf7c87947e5d0c (patch) | |
| tree | c2013d9a88a514411454a3967728cf1e97f4922b /indra/llxuixml/llinitparam.cpp | |
| parent | 0ee0a5eff41a3763b1fc3fc45a36f87fc6eedac5 (diff) | |
| parent | 1da3e890a6a426113c79513d74e94783c5762409 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index bb160b3c0b..451b638a3f 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -181,7 +181,8 @@ namespace LLInitParam bool BaseBlock::submitValue(Parser::name_stack_t& name_stack, Parser& p, bool silent) { - if (!deserializeBlock(p, std::make_pair(name_stack.begin(), name_stack.end()), true)) + Parser::name_stack_range_t range = std::make_pair(name_stack.begin(), name_stack.end()); + if (!deserializeBlock(p, range, true)) { if (!silent) { @@ -321,7 +322,7 @@ namespace LLInitParam return true; } - bool BaseBlock::deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack_range, bool ignored) + bool BaseBlock::deserializeBlock(Parser& p, Parser::name_stack_range_t& name_stack_range, bool ignored) { BlockDescriptor& block_data = mostDerivedBlockDescriptor(); bool names_left = name_stack_range.first != name_stack_range.second; |